gritz-native 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fbec78c6a2f02c4d9760dd2a85c9e773e155cd49e2f0382117744e5eb0781b0
-  data.tar.gz: 990aa947875a3518ae5286e1adde8be8f15dfd7d89946510f426b3e4656f0c8d
+  metadata.gz: 5b74d5378f2389a62bfaa76d68daddac7fe2b08b5d54fe55931baa2d0ef352c0
+  data.tar.gz: c546ba1e709dd568c352519cfd13da38f6faf7d79aba0caaaef7a65f9e48399f
 SHA512:
-  metadata.gz: f8d8b6ec0e6e498bf9a4a2fb47acdf9316180eecb8c05b60a9276da75d42a99eee529b2b27c08a7ec777ed2e997a2315f179f7760ef22184b5a7585e1a8414b8
-  data.tar.gz: ea17c656db545ecd2e046847a742f4c7343a1a4fcc15e1d7241ecc17f8d7b0507ef67724c481b8f0b725b24938dea602a3f00ed260ca4055047f335e1739fdaf
+  metadata.gz: 9483adad6e9e3d786113332e072c45232ad5bf2f0bcb432a9e022b1bd7aea689ebebe36001b918ce8785793e2591ee94cb6b4a71049cb3f6fbc2e9c76c5733cc
+  data.tar.gz: 8bd205690359103b323c819e0d2f24a3654c4a4e1e9048bee93e2757d45a5aaf36b326a580b46640e4ddcf130491a974c7f2ba4dd8e6ad199389e19503b6dc3f

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.9.1
+
+- Observe client cancellation while unary and streaming controllers are running, so `Context#check_cancelled!` releases the occupied pool slot.
+- Release close observers during normal responses, errors and shutdown without reporting successful calls as cancelled.
+- Cancellation observation adds a short-lived thread per admitted application RPC; fixed-runner overhead validation remains pending.
+- Require Gritz Core 0.9.1 for operational commands and corrected master readiness timeouts.
+
 ## 0.9.0
 
 - Require Gritz Core 0.9.0 for startup TLS-file validation and the stabilization support policy.

data/lib/gritz/native/version.rb

@@ -2,6 +2,6 @@
 
 module Gritz
   module Native
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/lib/gritz/transport/native/bridge.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "cancellation"
+
 module Gritz
   module Transport
     class Native
@@ -10,6 +12,8 @@ module Gritz
           Class.new(service_class) do
             self.service_name = service_class.service_name
             descriptors.each do |descriptor|
+              rpc_name = descriptor.name.to_sym
+              rpc_descs[rpc_name] = Cancellation::Descriptor.new(*rpc_descs.fetch(rpc_name).to_a)
               case descriptor.kind
               when :client_streaming
                 define_method(descriptor.action) do |view|

data/lib/gritz/transport/native/cancellation.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Gritz
+  module Transport
+    class Native
+      # grpc's server views read a client-status field which is never populated
+      # during a server handler. Observe C-core's close notification instead.
+      # @api private
+      module Cancellation
+        module ActiveCall
+          def cancelled? = @call.gritz_cancelled?
+        end
+
+        module CoreCall
+          def self.extended(call)
+            call.instance_variable_set(:@gritz_cancellation_mutex, Mutex.new)
+          end
+
+          def gritz_cancelled?
+            return @gritz_cancelled || false if @gritz_close_observer || @gritz_status_sent || @gritz_closed
+
+            @gritz_cancellation_mutex.synchronize do
+              return @gritz_cancelled || false if @gritz_close_observer || @gritz_status_sent || @gritz_closed
+
+              @gritz_cancelled ||= false
+              @gritz_close_observer = Thread.new do
+                method(:run_batch).super_method.call(GRPC::Core::CallOps::RECV_CLOSE_ON_SERVER => nil)
+              rescue GRPC::Core::CallError
+                nil
+              ensure
+                # grpc's BatchResult does not expose the C-core cancelled flag.
+                # Preserve failed-status cancellation if the observer runs later.
+                @gritz_cancelled ||= !@gritz_status_sent
+              end
+              @gritz_cancelled
+            end
+          end
+
+          def run_batch(operations)
+            # C-core accepts RECV_CLOSE only once. Its observer owns this op;
+            # grpc's ordinary status batches retain all their send operations.
+            sending_status = operations.key?(GRPC::Core::CallOps::SEND_STATUS_FROM_SERVER)
+            receiving_close = operations.key?(GRPC::Core::CallOps::RECV_CLOSE_ON_SERVER)
+            if sending_status || receiving_close
+              @gritz_cancellation_mutex.synchronize do
+                operations = operations.except(GRPC::Core::CallOps::RECV_CLOSE_ON_SERVER) if receiving_close && @gritz_close_observer
+                @gritz_status_sent = true if sending_status
+              end
+            end
+            super
+          rescue GRPC::Core::CallError
+            @gritz_cancelled = true if sending_status
+            raise
+          end
+
+          def close
+            @gritz_cancellation_mutex.synchronize do
+              @gritz_close_observer&.join
+              @gritz_closed = true
+              super
+            end
+          end
+
+          def finish_gritz_call
+            @gritz_cancellation_mutex.synchronize do
+              @gritz_closed = true
+              cancel if @gritz_close_observer&.alive?
+            end
+            close
+          end
+        end
+
+        class Descriptor < GRPC::RpcDesc
+          def run_server_method(active_call, ...)
+            raw = active_call.instance_variable_get(:@call)
+            raw.extend(CoreCall)
+            active_call.extend(ActiveCall)
+            super
+          ensure
+            raw&.finish_gritz_call
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gritz-native
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Yudai Takada
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,7 @@ files:
 - lib/gritz/transport/native.rb
 - lib/gritz/transport/native/bridge.rb
 - lib/gritz/transport/native/call.rb
+- lib/gritz/transport/native/cancellation.rb
 - lib/gritz/transport/native/client.rb
 - lib/gritz/transport/native/client_invocation.rb
 - lib/gritz/transport/native/health.rb