nonnative 3.34.0 → 3.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '028726d6f2465ec50e55504560c08adf2a1d4cb1cc487687f4308e03e50ebcaa'
-  data.tar.gz: 3309d497da450d41ac5044d446375ed8a937588045dc4a0305240880b59ac03d
+  metadata.gz: a9a3ed94a590e8273136387f186364d01270536a472d476fc806b8e9d1d06c07
+  data.tar.gz: 9b1b14eb944a13c83c93bf816d4b485d0f1818080167a6f5339c7bba73d59c31
 SHA512:
-  metadata.gz: 6213f4f042a0dab8767bb29021f80cd4d483b66a805165b746ba28c658532747778c51cf7c6720471d56ab5c2c8412f9694116331171d02b98e722d96eeef815
-  data.tar.gz: 1f36fe9bac571d834dfe837fb19173b1d9c062a7389e044df8620a940d38aa3bca40864a7e429dacfb20f15c57a36706d2ed352a1de53f5e86d9b2c8736e1407
+  metadata.gz: 370d1071e0665f5ea99a06a5dcf4fbe18224aee3d47b9f4279f3fd881c03340869fc11b1b8a58349065bae3d98ffa7be5243a34c26351366b53063676a7cb859
+  data.tar.gz: 94ad2439c76e863ee3b6a34655454e0610f3a7f8c0b5db23df9af0c0bfc54924ca63410008eccf4b261b6693f601c0495d2bc668bce5a96f9a5a319db44088da

data/README.md

@@ -79,6 +79,7 @@ Process/server fields:
 - `ports`: client-facing ports. These are also used for readiness/shutdown port checks.
 - `timeout`: max time (seconds) for each readiness/shutdown check. For processes, the same value also
   bounds optional HTTP/gRPC probes and graceful child exit after the stop signal. Defaults to `1.0`.
+  A value of `0` fails immediately; setting it to `nil` programmatically does the same.
 - `wait`: small sleep (seconds) between lifecycle steps.
 - `log`: per-runner log file used by process output redirection or server implementations.
 
@@ -89,7 +90,8 @@ Process-only fields:
 
 Service fields:
 - `port`: client-facing service port.
-- `timeout`: max time (seconds) for opt-in service readiness checks. Defaults to `1.0`.
+- `timeout`: max time (seconds) for opt-in service readiness checks. Defaults to `1.0`. A value of
+  `0` fails immediately; setting it to `nil` programmatically does the same.
 - `readiness`: optional list of startup readiness checks. Supported kind is `tcp`, which requires
   explicit `host` and `port`.
 
@@ -114,8 +116,8 @@ Nonnative.stop
 
 `Nonnative.start` runs ordered tiers: service lifecycle calls and optional readiness checks complete,
 then server lifecycle and readiness checks complete, then process lifecycle and readiness checks run.
-A failed service readiness check prevents later tiers; other collected startup errors trigger rollback
-after the attempted tiers finish. `Nonnative.stop` reverses the tiers: processes, servers, then
+A failed service lifecycle call or readiness check prevents later tiers; other collected startup errors
+trigger rollback after the attempted tiers finish. `Nonnative.stop` reverses the tiers: processes, servers, then
 services. Model dependencies in that direction; a managed server can satisfy a process dependency,
 but a server cannot wait on a managed process. Startup failures raise `Nonnative::StartError`, and
 shutdown failures raise `Nonnative::StopError`.

data/lib/nonnative/fault_injection_proxy.rb

@@ -52,6 +52,8 @@ module Nonnative
   # @see Nonnative::Proxy
   # @see Nonnative::SocketPairFactory
   class FaultInjectionProxy < Nonnative::Proxy
+    STOP_DRAIN_TIMEOUT = 1
+
     class Connection
       attr_accessor :pair, :thread
       attr_reader :socket
@@ -73,6 +75,7 @@ module Nonnative
       @logger = Logger.new(service.proxy.log)
       @mutex = Mutex.new
       @state = :none
+      @stopping = false
 
       super
     end
@@ -84,6 +87,7 @@ module Nonnative
     #
     # @return [void]
     def start
+      mutex.synchronize { @stopping = false }
       @tcp_server = ::TCPServer.new(service.host, service.port)
       @thread = Thread.new { perform_start }
 
@@ -95,6 +99,9 @@ module Nonnative
     # @return [void]
     def stop
       server = tcp_server
+      mark_stopping
+      close_connections
+      close_queued_connections(server)
       server&.close
 
       listener_thread = thread
@@ -107,8 +114,6 @@ module Nonnative
       @tcp_server = nil
       @thread = nil
 
-      close_connections
-
       Nonnative.logger.info "stopped with host '#{service.host}' and port '#{service.port}' for proxy 'fault_injection'"
     end
 
@@ -225,13 +230,16 @@ module Nonnative
 
     private
 
-    attr_reader :tcp_server, :thread, :connections, :mutex, :state, :logger
+    attr_reader :tcp_server, :thread, :connections, :mutex, :state, :logger, :stopping
 
     def perform_start
       loop do
         local_socket = tcp_server.accept
         id = local_socket.object_id
-        register_connection(id, local_socket)
+        unless register_connection(id, local_socket)
+          local_socket.close
+          next
+        end
         connection_thread = Thread.start(local_socket) do |accepted_socket|
           accept_connection id, accepted_socket
         end
@@ -275,6 +283,19 @@ module Nonnative
       end
     end
 
+    def close_queued_connections(server)
+      return unless server
+
+      # This connection is queued after every client that connected before shutdown began.
+      # When the listener accepts and closes it, those earlier clients have been closed as well.
+      barrier = TCPSocket.new(service.host, service.port)
+      barrier.wait_readable(STOP_DRAIN_TIMEOUT)
+    rescue IOError, SystemCallError
+      nil
+    ensure
+      barrier&.close
+    end
+
     def apply_state(state)
       Nonnative.logger.info "applying state '#{state}' for proxy 'fault_injection'"
 
@@ -293,7 +314,16 @@ module Nonnative
     end
 
     def register_connection(id, socket)
-      mutex.synchronize { connections[id] = Connection.new(socket) }
+      mutex.synchronize do
+        return false if stopping
+
+        connections[id] = Connection.new(socket)
+        true
+      end
+    end
+
+    def mark_stopping
+      mutex.synchronize { @stopping = true }
     end
 
     def attach_connection_thread(id, thread)

data/lib/nonnative/pool.rb

@@ -37,7 +37,7 @@ module Nonnative
       errors.concat(service_lifecycle(services, :start, :start))
       service_readiness_errors = check_service_readiness(services)
       errors.concat(service_readiness_errors)
-      return errors if service_readiness_errors.any?
+      return errors if errors.any?
 
       [servers, processes].each { |runners| errors.concat(run_lifecycle_checks(runners, :start, :open?, :start)) }
 

data/lib/nonnative/timeout.rb

@@ -15,7 +15,7 @@ module Nonnative
   #   # ok is either the block result or false if the timeout elapsed
   #
   class Timeout
-    # @param time [Numeric] timeout duration in seconds
+    # @param time [Numeric, nil] timeout duration in seconds; zero and `nil` values time out immediately
     def initialize(time)
       @time = time
     end
@@ -23,10 +23,13 @@ module Nonnative
     # Executes the given block with the configured timeout.
     #
     # If the timeout elapses, returns `false` instead of raising `Timeout::Error`.
+    # Zero and `nil` durations also return `false` without running the block.
     #
     # @yield the work to execute under a timeout
     # @return [Object, false] the block's return value, or `false` if the timeout elapsed
     def perform(&)
+      return false if time.nil? || time.zero?
+
       ::Timeout.timeout(time, &)
     rescue ::Timeout::Error
       false

data/lib/nonnative/version.rb

@@ -4,5 +4,5 @@ module Nonnative
   # The current gem version.
   #
   # @return [String]
-  VERSION = '3.34.0'
+  VERSION = '3.35.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 3.34.0
+  version: 3.35.0
 platform: ruby
 authors:
 - Alejandro Falkowski