protobuf 2.6.6-java → 2.7.0-java

data/bin/rpc_server

@@ -2,4 +2,3 @@
 
 require 'protobuf/cli'
 ::Protobuf::CLI.start(ARGV)
-

data/lib/protobuf/rpc/connectors/socket.rb

@@ -14,8 +14,6 @@ module Protobuf
             post_init
             read_response
           end
-        ensure
-          @socket.close unless @socket.closed?
         end
 
         def log_signature

data/lib/protobuf/rpc/servers/zmq/broker.rb

@@ -6,29 +6,38 @@ module Protobuf
     module Zmq
       class Broker
         include ::Protobuf::Rpc::Zmq::Util
-        attr_reader :frontend, :backend, :poller, :context
+        attr_reader :frontend, :backend, :poller, :context, :available_workers
 
         ##
         # Constructor
         #
         def initialize(options = {})
+          @available_workers = []
           @context = ::ZMQ::Context.new
           @frontend = setup_frontend(options)
           @backend = setup_backend(options)
-          @poller = setup_poller
+          @poller = ::ZMQ::Poller.new
+          @poller.register(frontend, ::ZMQ::POLLIN)
+          @poller.register(backend, ::ZMQ::POLLIN)
         end
 
         ##
         # Instance Methods
         #
         def poll
+          if available_workers.size > 0
+            poller.register(frontend, ::ZMQ::POLLIN) if poller.size < 2
+          else
+            poller.delete(frontend)            
+          end
+
           poller.poll(1000)
           poller.readables.each do |socket|
             case socket
             when frontend then
-              move_to(backend, socket)
+              move_to_backend(socket)
             when backend then
-              move_to(frontend, socket)
+              move_to_frontend(socket)
             end
           end
         end
@@ -41,14 +50,37 @@ module Protobuf
 
         private
 
-          def move_to(frontend_or_backend, socket)
-            more_data = true
+          def move_to_backend(socket)
+            message_array = []
+            zmq_error_check(socket.recv_strings(message_array))
+
+            backend_message_set = [
+              available_workers.shift, # Worker UUID for router
+              "",
+              message_array[0], # Client UUID for return value
+              "",
+              message_array[2] # Client Message payload (request)
+            ]
+
+            zmq_error_check(backend.send_strings(backend_message_set))
+          end
+
+          def move_to_frontend(socket)
+            message_array = []
+            zmq_error_check(socket.recv_strings(message_array))
+
+            # Push UUID of socket on the available workers queue
+            available_workers << message_array[0]
+
+            # messages should be [ "uuid of socket", "", "READY_MESSAGE || uuid of client socket"]
+            unless message_array[2] == ::Protobuf::Rpc::Zmq::WORKER_READY_MESSAGE
+              frontend_message_set = [
+                message_array[2], # client UUID
+                "",
+                message_array[4] # Reply payload
+              ]
 
-            while more_data do
-              socket.recv_string(data = "")
-              more_data = socket.more_parts?
-              more_data_flag = (more_data ? ::ZMQ::SNDMORE : 0)
-              frontend_or_backend.send_string(data, more_data_flag)
+              zmq_error_check(frontend.send_strings(frontend_message_set))
             end
           end
 
@@ -57,7 +89,7 @@ module Protobuf
             host = dealer_options[:host]
             port = dealer_options[:port]
 
-            zmq_backend = context.socket(::ZMQ::DEALER)
+            zmq_backend = context.socket(::ZMQ::ROUTER)
             zmq_error_check(zmq_backend.bind(bind_address(host, port)))
             zmq_backend
           end
@@ -74,13 +106,6 @@ module Protobuf
           def bind_address(host, port)
             "tcp://#{resolve_ip(host)}:#{port}"
           end
-
-          def setup_poller
-            zmq_poller = ::ZMQ::Poller.new
-            zmq_poller.register(frontend, ::ZMQ::POLLIN)
-            zmq_poller.register(backend, ::ZMQ::POLLIN)
-            zmq_poller
-          end
       end
     end
   end

data/lib/protobuf/rpc/servers/zmq/util.rb

@@ -2,6 +2,8 @@ module Protobuf
   module Rpc
     module Zmq
 
+      WORKER_READY_MESSAGE = "WORKER_READY"
+
       module Util
         include ::Protobuf::Logger::LogMethods
         def self.included(base)

data/lib/protobuf/rpc/servers/zmq/worker.rb

@@ -16,19 +16,25 @@ module Protobuf
           port = options[:port]
 
           @zmq_context = ::ZMQ::Context.new
-          @socket = @zmq_context.socket(::ZMQ::REP)
+          @socket = @zmq_context.socket(::ZMQ::REQ)
           zmq_error_check(@socket.connect("tcp://#{resolve_ip(host)}:#{port}"))
 
           @poller = ::ZMQ::Poller.new
           @poller.register(@socket, ::ZMQ::POLLIN)
+
+          # Send request to broker telling it we are ready
+          zmq_error_check(@socket.send_string(::Protobuf::Rpc::Zmq::WORKER_READY_MESSAGE))
         end
 
         ##
         # Instance Methods
         #
         def handle_request(socket)
-          @request_data = ''
-          zmq_error_check(socket.recv_string(@request_data))
+          message_array = []
+          zmq_error_check(socket.recv_strings(message_array))
+
+          @request_data = message_array[2]
+          @client_address = message_array[0]
           log_debug { sign_message("handling request") } unless @request_data.nil?
         end
 
@@ -50,8 +56,15 @@ module Protobuf
 
         def send_data
           response_data = @response.to_s # to_s is aliases as serialize_to_string in Message
+
+          response_message_set = [
+            @client_address, # client uuid address
+            "",
+            response_data
+          ]
+
           @stats.response_size = response_data.size
-          zmq_error_check(@socket.send_string(response_data))
+          zmq_error_check(@socket.send_strings(response_message_set))
         end
       end
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.6.6'
+  VERSION = '2.7.0'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb

@@ -3,29 +3,20 @@ require 'spec_helper'
 describe ::Protobuf::Rpc::Zmq::Worker do
   before(:each) do 
     load 'protobuf/zmq.rb'
-  end
 
-  after(:each) do
-    subject.instance_variable_get(:@socket).close
-    subject.instance_variable_get(:@zmq_context).terminate
+    fake_socket = double
+    fake_socket.should_receive(:connect).and_return(0)
+    fake_socket.should_receive(:send_string).and_return(0)
+
+    fake_context = double
+    fake_context.should_receive(:socket).and_return( fake_socket )
+    ::ZMQ::Context.should_receive(:new).and_return( fake_context )
   end
 
   subject do
     described_class.new({ :host => '127.0.0.1', :port => 9400 })
   end
 
-  it 'sets the context' do
-    subject.instance_variable_get(:@zmq_context).should be_a(::ZMQ::Context)
-  end
-
-  it 'sets the poller' do
-    subject.instance_variable_get(:@socket).should be_a(::ZMQ::Socket)
-  end
-
-  it 'sets the socket' do
-    subject.instance_variable_get(:@poller).should be_a(::ZMQ::Poller)
-  end
-
   describe '#run' do
     # not tested via unit tests
   end

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.6.6
+  version: 2.7.0
 platform: java
 authors:
 - BJ Neilsen