gruf 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aebffd1712a25d5025e60e61797fd6089417db3d79c5be2de9374b3eeda71571
-  data.tar.gz: 82324e0b421ac2d82d2133dcf482746e6c6faaa31f7cbf50de3adaf31ae857ac
+  metadata.gz: a94efb294635ae84890e1f131927003b8cacb0306947109c96fd002e02c87fee
+  data.tar.gz: 11983bf914472178ed2935d7ee0faf7c60d4fd2204fc6b7b3b0985449c7b5c37
 SHA512:
-  metadata.gz: eae3c9439c9b8e9c6b7d26a30c7485aac0c3919bb174a9b2a8b23b7f863f5f2ddacbb52c87489724ac9e4345214ec585f257f852e94d8af27486ec12bb971aaf
-  data.tar.gz: 0fb952bb1e354fc5f756e1263b5a1929e68647df757d5da97d0689aa4f09185abd2cd4f91d023faf56fa75fc9b828098c670cf17a5bd171b2511ae0ae5d4096b
+  metadata.gz: bf230312d6315af4534e4bb92bbd7405a9850c1ec415895e7cb25f382239f887b8fadf0940207459d237c81c3fe2da0647244c3b1100f73a441c77e118a9bea6
+  data.tar.gz: e505ca2046aa82164be4656aca0b9ad7f696c070abd5c7ea52f8d6afd6e803feaaef095cf96825a2b8dc8b186f4015b8430f68f0c1f9ce472d2764976d596a4f

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.14.1
+
+- Fix issue where the server object hits thread contention in certain race conditions
+
 ### 2.14.0
 
 - Set default client host to 0.0.0.0:9001 (same as default server host)

data/lib/gruf/server.rb

@@ -54,28 +54,30 @@ module Gruf
     # @return [GRPC::RpcServer] The GRPC server running
     #
     def server
-      @server ||= begin
-        # For backward compatibility, we allow these options to be passed directly
-        # in the Gruf::Server options, or via Gruf.rpc_server_options.
-        server_options = {
-          pool_size: options.fetch(:pool_size, Gruf.rpc_server_options[:pool_size]),
-          max_waiting_requests: options.fetch(:max_waiting_requests, Gruf.rpc_server_options[:max_waiting_requests]),
-          poll_period: options.fetch(:poll_period, Gruf.rpc_server_options[:poll_period]),
-          pool_keep_alive: options.fetch(:pool_keep_alive, Gruf.rpc_server_options[:pool_keep_alive]),
-          connect_md_proc: options.fetch(:connect_md_proc, Gruf.rpc_server_options[:connect_md_proc]),
-          server_args: options.fetch(:server_args, Gruf.rpc_server_options[:server_args])
-        }
-
-        server = if @event_listener_proc
-                   server_options[:event_listener_proc] = @event_listener_proc
-                   Gruf::InstrumentableGrpcServer.new(**server_options)
-                 else
-                   GRPC::RpcServer.new(**server_options)
-                 end
-
-        @port = server.add_http2_port(@hostname, ssl_credentials)
-        @services.each { |s| server.handle(s) }
-        server
+      server_mutex do
+        @server ||= begin
+          # For backward compatibility, we allow these options to be passed directly
+          # in the Gruf::Server options, or via Gruf.rpc_server_options.
+          server_options = {
+            pool_size: options.fetch(:pool_size, Gruf.rpc_server_options[:pool_size]),
+            max_waiting_requests: options.fetch(:max_waiting_requests, Gruf.rpc_server_options[:max_waiting_requests]),
+            poll_period: options.fetch(:poll_period, Gruf.rpc_server_options[:poll_period]),
+            pool_keep_alive: options.fetch(:pool_keep_alive, Gruf.rpc_server_options[:pool_keep_alive]),
+            connect_md_proc: options.fetch(:connect_md_proc, Gruf.rpc_server_options[:connect_md_proc]),
+            server_args: options.fetch(:server_args, Gruf.rpc_server_options[:server_args])
+          }
+
+          server = if @event_listener_proc
+                     server_options[:event_listener_proc] = @event_listener_proc
+                     Gruf::InstrumentableGrpcServer.new(**server_options)
+                   else
+                     GRPC::RpcServer.new(**server_options)
+                   end
+
+          @port = server.add_http2_port(@hostname, ssl_credentials)
+          @services.each { |s| server.handle(s) }
+          server
+        end
       end
     end
 
@@ -242,5 +244,17 @@ module Gruf
       Process.setproctitle("gruf #{Gruf::VERSION} -- #{state}")
     end
     # :nocov:
+    #
+
+    ##
+    # Handle thread-safe access to the server
+    #
+    def server_mutex(&block)
+      @server_mutex ||= begin
+        require 'monitor'
+        Monitor.new
+      end
+      @server_mutex.synchronize(&block)
+    end
   end
 end

data/lib/gruf/version.rb

@@ -16,5 +16,5 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Gruf
-  VERSION = '2.14.0'
+  VERSION = '2.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit