protobuf 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79198f130aec8d18aae9ef3a3170e16bd67f4ff3
-  data.tar.gz: 3c13e8622eea8728f59a9279b37140438ae65d71
+  metadata.gz: 5bb5d776c81e8200caad253a8be81e107ce831bb
+  data.tar.gz: 9c69a987b14927860a5b4d98a01c588430b6655d
 SHA512:
-  metadata.gz: 7931e2b2a6943bd7f0c1e9f2ad5de360e8f127b37a413074a74ae571e70a0ac0331c6a9292918b6ee5836bee3c686a5cc751813a2c851b2824dc244012577d2f
-  data.tar.gz: 23a58d4a0b01ea80ad10c4c6857834606341f0f4d8d6df3b3ca3f34a920ba393fe55b5b33feb1e3d05ac53bfb1ef742d254ee79e00613bbee3df2daab4afe824
+  metadata.gz: 0c3891829c33f48f7526c3c00f2b29e5fd5269c35d635838a036aa844330f391cb98146161b11a0d53334476cbaf337d51c331eb084aa96ed3e504c1d14058e6
+  data.tar.gz: 1b073df66474e5689306916be8af7ec260f7a0428c2d6002d07cbb6fd0eb4a071135ebdd60e6fffd836254b7923dbb5abbca06dc479f60e0ad86d0568695b357

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

@@ -28,7 +28,8 @@ module Protobuf
           @ping_port_responses ||= ::ThreadSafe::Cache.new
         end
 
-        def self.zmq_context
+        def self.zmq_context(reload = false)
+          @zmq_contexts = nil if reload
           @zmq_contexts ||= Hash.new do |hash, key|
             hash[key] = ZMQ::Context.new
           end
@@ -88,7 +89,11 @@ module Protobuf
         # service. The LINGER is set to 0 so we can close immediately in
         # the event of a timeout
         def create_socket
+          has_reloaded_context = false
+          attempt_number = 0
+
           begin
+            attempt_number += 1
             socket = zmq_context.socket(::ZMQ::REQ)
 
             if socket # Make sure the context builds the socket
@@ -97,8 +102,16 @@ module Protobuf
               zmq_error_check(socket.connect(server_uri), :socket_connect)
               socket = socket_to_available_server(socket) if first_alive_load_balance?
             end
-          end while socket.try(:socket).nil?
 
+            if !has_reloaded_context && attempt_number == socket_creation_attempts
+              logger.info { sign_message("Reset Context: could not create socket") }
+              zmq_context(true) # reload the context
+              attempt_number = 0
+              has_reloaded_context = true
+            end
+          end while socket.nil? && attempt_number < socket_creation_attempts
+
+          raise RequestTimeout, "Cannot create new ZMQ client socket" if socket.nil?
           socket
         end
 
@@ -241,6 +254,10 @@ module Protobuf
           end
         end
 
+        def socket_creation_attempts
+          @socket_creation_attempts ||= (ENV["PB_ZMQ_CLIENT_SOCKET_CREATION_ATTEMPTS"] || 5).to_i
+        end
+
         def socket_to_available_server(socket)
           check_available_response = ""
           socket.setsockopt(::ZMQ::RCVTIMEO, check_available_rcv_timeout)
@@ -263,8 +280,8 @@ module Protobuf
         # If the context does not exist, create it, then register
         # an exit block to ensure the context is terminated correctly.
         #
-        def zmq_context
-          self.class.zmq_context
+        def zmq_context(reload = false)
+          self.class.zmq_context(reload)
         end
 
         def zmq_eagain_error_check(return_code, source)

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.7.2' # rubocop:disable Style/MutableConstant
+  VERSION = '3.7.3' # rubocop:disable Style/MutableConstant
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - BJ Neilsen