protobuf 2.8.0.beta6-java → 2.8.0.beta8-java

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

@@ -34,6 +34,14 @@ module Protobuf
         def send_request
           raise 'If you inherit a Connector from Base you must implement send_request'
         end
+
+        def ping_port
+          @ping_port ||= ENV["PB_RPC_PING_PORT"]
+        end
+
+        def ping_port_enabled?
+          ENV.has_key?("PB_RPC_PING_PORT")
+        end
       end
     end
   end

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

@@ -43,7 +43,7 @@ module Protobuf
         #
         def send_request
           setup_connection
-          send_request_with_lazy_pirate
+          send_request_with_lazy_pirate unless error?
         end
 
         def log_signature
@@ -87,16 +87,27 @@ module Protobuf
         # to the host and port in the options
         #
         def lookup_server_uri
-          if service_directory.running?
+          begin
             listing = service_directory.lookup(service)
-            host, port = listing.address, listing.port if listing
-          end
-
-          host, port = options[:host], options[:port] unless host && port
+            host = listing.try(:address) || options[:host]
+            port = listing.try(:port) || options[:port]
+          end until host_alive?( host )
 
           "tcp://#{host}:#{port}"
         end
 
+        def host_alive?(host)
+          return true unless ping_port_enabled?
+
+          socket = TCPSocket.new(host, ping_port.to_i)
+
+          true
+        rescue
+          false
+        ensure
+          socket.close rescue nil
+        end
+
         # Trying a number of times, attempt to get a response from the server.
         # If we haven't received a legitimate response in the CLIENT_RETRIES number
         # of retries, fail the request.
@@ -113,8 +124,6 @@ module Protobuf
           rescue RequestTimeout
             retry if attempt < CLIENT_RETRIES
             fail(:RPC_FAILED, "The server repeatedly failed to respond within #{timeout} seconds")
-          rescue => e
-            fail(:RPC_FAILED, "Unexpected error sending request: #{e}")
           end
         end
 

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

@@ -19,8 +19,14 @@ module Protobuf
         def run
           @idle_workers = []
 
-          while running?
-            break if @poller.poll(500) < 0
+          loop do
+            rc = @poller.poll(500)
+
+            # The server was shutdown and no requests are pending
+            break if rc == 0 && !running?
+
+            # Something went wrong
+            break if rc == -1
 
             @poller.readables.each do |readable|
               case readable

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

@@ -41,10 +41,16 @@ module Protobuf
           # Send request to broker telling it we are ready
           write_to_backend([::Protobuf::Rpc::Zmq::WORKER_READY_MESSAGE])
 
-          while running?
-            break if poller.poll(500) < 0
+          loop do
+            rc = poller.poll(500)
 
-            if poller.readables.any?
+            # The server was shutdown and no requests are pending
+            break if rc == 0 && !running?
+
+            # Something went wrong
+            break if rc == -1
+
+            if rc > 0
               initialize_request!
               process_request
             end

data/lib/protobuf/rpc/service_directory.rb

@@ -89,14 +89,16 @@ module Protobuf
       end
 
       def lookup(service)
-        @mutex.synchronize do
-          listings = @listings.values.select do |listing|
-            listing.services.any? do |listed_service|
-              listing.current? && listed_service == service.to_s
+        if running?
+          @mutex.synchronize do
+            listings = @listings.values.select do |listing|
+              listing.services.any? do |listed_service|
+                listing.current? && listed_service == service.to_s
+              end
             end
-          end
 
-          listings.sample
+            listings.sample
+          end
         end
       end
 
@@ -153,17 +155,6 @@ module Protobuf
         @socket = nil
       end
 
-      def wait_for(service, timeout = DEFAULT_TIMEOUT)
-        log_debug { sign_message("waiting for #{service}") }
-        Timeout.timeout(timeout) do
-          sleep(timeout / 10.0) until listing = lookup(service)
-          listing
-        end
-      rescue
-        log_info { sign_message("no listing found for #{service}") }
-        nil
-      end
-
       private
 
       def init_socket

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.8.0.beta6'
+  VERSION = '2.8.0.beta8'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/functional/zmq_server_spec.rb

@@ -104,7 +104,7 @@ describe 'Functional ZMQ Client' do
         c.on_success { raise "shouldn't pass" }
         c.on_failure { |e| error = e }
       end
-      error.message.should match(/The server took longer than 1 seconds to respond/i)
+      error.message.should match(/The server repeatedly failed to respond/)
     end
   end
 

data/spec/lib/protobuf/rpc/connectors/zmq_spec.rb

@@ -52,13 +52,57 @@ describe ::Protobuf::Rpc::Connectors::Zmq do
     context "when the service directory is not running" do
       let(:running?) { false }
 
-      it "does not search the directory" do
-        service_directory.should_not_receive(:lookup)
+      it "defaults to the options" do
+        service_directory.should_receive(:lookup) { nil }
         subject.send(:lookup_server_uri).should eq "tcp://127.0.0.1:9400"
       end
     end
 
+    it "checks if the server is alive" do
+      service_directory.should_receive(:lookup) { nil }
+      subject.should_receive(:host_alive?).with("127.0.0.1") { true }
+      subject.send(:lookup_server_uri).should eq "tcp://127.0.0.1:9400"
+    end
+
   end
 
-  pending
+  describe "#host_alive?" do
+    context "when the PB_RPC_PING_PORT is not set" do
+      before do
+        ENV.delete("PB_RPC_PING_PORT")
+      end
+
+      it "returns true" do
+        subject.send(:host_alive?, "yip.yip").should be_true
+      end
+
+      it "does not attempt a connection" do
+        TCPSocket.should_not_receive(:new)
+        subject.send(:host_alive?, "blargh.com")
+      end
+    end
+
+    context "when the PB_RPC_PING_PORT is set" do
+      before do
+        ENV["PB_RPC_PING_PORT"] = "3307"
+      end
+
+      it "returns true when the connection succeeds" do
+        TCPSocket.should_receive(:new).with("huzzah.com", 3307) { double(:close => nil) }
+        subject.send(:host_alive?, "huzzah.com").should be_true
+      end
+
+      it "returns false when the connection fails" do
+        TCPSocket.should_receive(:new).with("hayoob.com", 3307).and_raise(Errno::ECONNREFUSED)
+        subject.send(:host_alive?, "hayoob.com").should be_false
+      end
+
+      it "closes the socket" do
+        socket = double("TCPSocket")
+        socket.should_receive(:close)
+        TCPSocket.should_receive(:new).with("absorbalof.com", 3307) { socket }
+        subject.send(:host_alive?, "absorbalof.com").should be_true
+      end
+    end
+  end
 end

data/spec/lib/protobuf/rpc/service_directory_spec.rb

@@ -31,6 +31,10 @@ describe ::Protobuf::Rpc::ServiceDirectory do
                           :ttl => 15) }
     let(:listing) { ::Protobuf::Rpc::ServiceDirectory::Listing.new(server) }
 
+    before do
+      instance.stub(:running?) { true }
+    end
+
     it "returns a listing for the given service" do
       instance.add_listing_for(server)
       instance.lookup("Known::Service").should eq listing
@@ -95,43 +99,6 @@ describe ::Protobuf::Rpc::ServiceDirectory do
     end
   end
 
-  describe "#wait_for" do
-    it "returns a listing for the given service" do
-      server = double(:uuid => 1, :ttl => 5, :services => ["Test"])
-      instance.add_listing_for server
-      instance.lookup("Test").should eq server
-    end
-
-    it "depends on #lookup" do
-      instance.stub(:lookup).with("Hayoob!") { "yup" }
-      instance.wait_for("Hayoob!").should eq "yup"
-    end
-
-    it "waits for the service to appear" do
-      server = double(:uuid => 1, :ttl => 5, :services => ["Test"])
-
-      t = Thread.new do
-        sleep 0.5
-        instance.add_listing_for server
-      end
-
-      duration { instance.wait_for("Test") }.should be_within(0.01).of(0.5)
-      t.join
-    end
-
-    it "returns nil if the service doesn't appear withint the timeout period" do
-      server = double(:uuid => 1, :ttl => 5, :services => ["Test"])
-
-      t = Thread.new do
-        sleep 0.5
-        instance.add_listing_for server
-      end
-
-      instance.wait_for("Test", 0.1).should be_nil
-      t.join
-    end
-  end
-
   describe "a running service directory" do
     let(:socket) { UDPSocket.new }
 

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 2.8.0.beta6
+  version: 2.8.0.beta8
 platform: java
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -546,90 +546,5 @@ rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for Ruby.
-test_files:
-- spec/benchmark/tasks.rb
-- spec/functional/embedded_service_spec.rb
-- spec/functional/evented_server_spec.rb
-- spec/functional/socket_server_spec.rb
-- spec/functional/zmq_server_spec.rb
-- spec/lib/protobuf/cli_spec.rb
-- spec/lib/protobuf/enum_spec.rb
-- spec/lib/protobuf/enum_value_spec.rb
-- spec/lib/protobuf/field/int32_field_spec.rb
-- spec/lib/protobuf/logger_spec.rb
-- spec/lib/protobuf/message_spec.rb
-- spec/lib/protobuf/rpc/client_spec.rb
-- spec/lib/protobuf/rpc/connector_spec.rb
-- spec/lib/protobuf/rpc/connectors/base_spec.rb
-- spec/lib/protobuf/rpc/connectors/common_spec.rb
-- spec/lib/protobuf/rpc/connectors/socket_spec.rb
-- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
-- spec/lib/protobuf/rpc/servers/evented_server_spec.rb
-- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
-- spec/lib/protobuf/rpc/service_directory_spec.rb
-- spec/lib/protobuf/rpc/service_dispatcher_spec.rb
-- spec/lib/protobuf/rpc/service_filters_spec.rb
-- spec/lib/protobuf/rpc/service_spec.rb
-- spec/lib/protobuf_spec.rb
-- spec/spec_helper.rb
-- spec/support/all.rb
-- spec/support/packed_field.rb
-- spec/support/server.rb
-- spec/support/test/enum.pb.rb
-- spec/support/test/enum.proto
-- spec/support/test/extended.pb.rb
-- spec/support/test/extended.proto
-- spec/support/test/multi_field_extensions.pb.rb
-- spec/support/test/multi_field_extensions.proto
-- spec/support/test/resource.pb.rb
-- spec/support/test/resource.proto
-- spec/support/test/resource_service.rb
-- spec/support/test_app_file.rb
-- spec/support/tolerance_matcher.rb
-- test/data/data.bin
-- test/data/data_source.py
-- test/data/types.bin
-- test/data/types_source.py
-- test/data/unk.png
-- test/proto/addressbook.pb.rb
-- test/proto/addressbook.proto
-- test/proto/addressbook_base.pb.rb
-- test/proto/addressbook_base.proto
-- test/proto/addressbook_ext.pb.rb
-- test/proto/addressbook_ext.proto
-- test/proto/collision.pb.rb
-- test/proto/collision.proto
-- test/proto/ext_collision.pb.rb
-- test/proto/ext_collision.proto
-- test/proto/ext_range.pb.rb
-- test/proto/ext_range.proto
-- test/proto/float_default.proto
-- test/proto/lowercase.pb.rb
-- test/proto/lowercase.proto
-- test/proto/merge.pb.rb
-- test/proto/merge.proto
-- test/proto/nested.pb.rb
-- test/proto/nested.proto
-- test/proto/optional_field.pb.rb
-- test/proto/optional_field.proto
-- test/proto/packed.pb.rb
-- test/proto/packed.proto
-- test/proto/rpc.proto
-- test/proto/types.pb.rb
-- test/proto/types.proto
-- test/test_addressbook.rb
-- test/test_enum_value.rb
-- test/test_extension.rb
-- test/test_lowercase.rb
-- test/test_message.rb
-- test/test_optional_field.rb
-- test/test_packed_field.rb
-- test/test_parse.rb
-- test/test_repeated_types.rb
-- test/test_serialize.rb
-- test/test_standard_message.rb
-- test/test_types.rb
+test_files: []
 has_rdoc: