grpc_kit 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 429df1d2acc2083513f55a3b12dc612e0f27b2ae0a7fb13b198bc304294d6f75
-  data.tar.gz: 482c39c5674efbf8a08c6deadb93eea903078460d2eba85532728d7ddeb58a80
+  metadata.gz: d8fa450f3e7d2485f61e54edcbe6e664e63c5f4159c2f8c594600fa333a0eea0
+  data.tar.gz: 5bd5154135572f48b683683aad531631f346562efd4841abfbf1ad0b3e3f4f5f
 SHA512:
-  metadata.gz: 036c1f0bba4959a1a6a0aa0f060251bae8ea6624872f2a17b636ce1c5aa1fd5168a0f7ad12340ee2a71a7954088ca98d02b11455d6fb5c3adc523617d3bb5004
-  data.tar.gz: 2b99be0aeedd437596ad8a94b25f25ddf06f45c2dbccad6da55e3bc27b339184c6dfe6d7c4ccca561f1f296f0369fa711042ce904e8bcf1b55c611e5da85ec34
+  metadata.gz: cdd2a48377437970948468ac4ac9035dede0e79d8df6911416a44589d1e416b3470ac1b785784d8d37c80c89a0539859c736cbbf5952408b938fee9562543076
+  data.tar.gz: 1d6b13647c1f0ec44cfd0828b5c88b7d42375378654f27b35702f9ab6c90ce3e06c3ee9747eee3884b90dfdd6af957f0c5820dfa38a7cdf206a5d37e49f78649

data/lib/grpc_kit/server.rb

@@ -64,23 +64,23 @@ module GrpcKit
     end
 
     # This method is expected to be called in trap context
+    # @params timeout [Boolean] timeout error could be raised or not
     # @return [void]
-    def graceful_shutdown
+    def graceful_shutdown(timeout: true)
       @stopping = true
 
       Thread.new do
         GrpcKit.logger.debug('graceful shutdown')
         @mutex.synchronize { @sessions.each(&:drain) }
 
-        end_time = Time.now + @shutdown_timeout
-        loop do
-          if end_time < Time.now
-            GrpcKit.logger.error("Graceful shutdown is timeout (#{@shutdown_timeout}sec). Perform shutdown forceibly")
-            shutdown_sessions
-            break
-          elsif @sessions.empty?
-            break
+        begin
+          sec = timeout ? @shutdown_timeout : 0
+          Timeout.timeout(sec) do
+            sleep 1 until @sessions.empty?
           end
+        rescue Timeout::Error => _
+          GrpcKit.logger.error("Graceful shutdown is timeout (#{@shutdown_timeout}sec). Perform shutdown forceibly")
+          shutdown_sessions
         end
       end
     end

data/lib/grpc_kit/session/drain_controller.rb

@@ -8,12 +8,14 @@ module GrpcKit
       module Status
         NOT_START = 0
         STARTED = 1
-        SENT_PING = 2
-        RECV_PING_ACK = 3
-        SENT_GOAWAY = 4
+        SENT_SHUTDOWN = 2
+        SENT_PING = 3
+        RECV_PING_ACK = 4
+        SENT_GOAWAY = 5
       end
 
-      def initialize
+      def initialize(draining_time = 5)
+        @draining_time = draining_time
         @status = Status::NOT_START
       end
 
@@ -39,15 +41,22 @@ module GrpcKit
           # next_step
         when Status::STARTED
           session.submit_shutdown
+          next_step
+        when Status::SENT_SHUTDOWN
           session.submit_ping
+          @sent_time = Time.now.to_i
           next_step
         when Status::SENT_PING
           # skip until #recv_ping_ack is called (1RTT)
         when Status::RECV_PING_ACK
+          if @sent_time && (Time.now.to_i - @sent_time) > @draining_time
+            return
+          end
+
           session.submit_goaway(DS9::NO_ERROR, session.last_proc_stream_id)
           next_step
         when Status::SENT_GOAWAY
-          session.shutdown
+          # session.shutdown
         end
       end
 

data/lib/grpc_kit/session/server_session.rb

@@ -54,6 +54,10 @@ module GrpcKit
           return false
         end
 
+        if @drain_controller.start_draining?
+          @drain_controller.next(self)
+        end
+
         rs, ws = @io.select
 
         if !rs.empty? && want_read?
@@ -178,10 +182,7 @@ module GrpcKit
         when DS9::Frames::Ping
           if frame.ping_ack?
             GrpcKit.logger.debug('ping ack is received')
-            # nghttp2 can't send any data once server sent actaul GoAway(not shutdown notice) frame.
-            # We want to send data in case of ClientStreamer or BidiBstreamer which they are sending data in same stream
-            # So we have to wait to send actual GoAway frame untill timeout or something
-            # @drain_controller.recv_ping_ack
+            @drain_controller.recv_ping_ack
           end
           # when DS9::Frames::Goaway
           # when DS9::Frames::RstStream

data/lib/grpc_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9