hotcell-server 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b69f25f352406df26617692f42c1ce78c7191df4d7b617360c62c2371e488bed
-  data.tar.gz: 34ca8c1eea5a9de3cf739ce548151ac5c9487e185739f684d179844c13257b1d
+  metadata.gz: 14fae075c3d4fef73a330453eff2c295ac7e67895d50e2b9ad73d800b50ff2f8
+  data.tar.gz: d3730524324b2283332bdf2f04c90923a6dc3b0ed4a8b6821b10dc46a7e1fd3a
 SHA512:
-  metadata.gz: 5667ac9be32cd60ab131df56fb4be0a0354f007a19d31990c6210076dcd6e72c019a903b8e4f4f89ed5bf4ee444269de2b30d4776aa6373750f02ab21fa2869b
-  data.tar.gz: 9567d005d357239081a4c804b081939714c1ead9afb2588fcbd95d6795c638770348959d00549d49d9b76ec7cdc7bb0e3b2f7dd226a1a001d0c532fb524a05d2
+  metadata.gz: 063e11ec9aac319a707f3ca11d2d92b02d4aeeeffc35fdf2ec7e169ab8e14b82f4949b0d6f03255a4285186d43620ccb102584feaa616c02677ce6cefbee39b4
+  data.tar.gz: f7ca005517c6bc32c6e3b803b3c577b4e5e103bcc34b603e64534526430189b8f5b39cc87ee3235832ec4d2c078088091251fa1c66e409111ef20020d6d3e5ff

data/lib/hot_cell/control.rb

@@ -40,8 +40,12 @@ module HotCell
 
     # Static, and called once per registered cell at app boot. It is the cheapest way to catch a client
     # whose own timeout is below what this cell may take, and it is what `bin/hotcell describe` reads.
+    #
+    # `v` is the wire format and changes only when the format does; `server_version` says which release of
+    # hotcell-server is answering.
     def describe
-      { v: PROTOCOL_VERSION, operations: Registry.names, groups: groups, **@configuration.to_h }
+      { v: PROTOCOL_VERSION, server_version: Server::VERSION, operations: Registry.names, groups: groups,
+        **@configuration.to_h }
     end
 
     private

data/lib/hot_cell/health_operations.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "hot_cell/server"
+
+# The two round trips an application runs against its own cell for a health check. Shipped in the
+# gem because every deployment was copying them from examples/, and copies drift.
+#
+# A cell serves them only if it requires this file.
+module HotCell
+  module Health
+    # The message goes in through the caller's input descriptor and out through the caller's output
+    # descriptor, with no copy onto scratch, so one round trip proves descriptor passing end to end.
+    class Echo < HotCell::Operation
+      operation "health.echo"
+
+      def perform(inputs, outputs)
+        bytes = outputs.first.to_io.write(inputs.first.to_io.read)
+
+        { bytes: bytes, staged: inputs.first.staged? }
+      end
+    end
+
+    # `fd_path` is a fresh open by name — `/dev/fd/N` on Linux, the file's own path on macOS — checked
+    # against this process's uid and the file's mode, so this succeeds only when the cell can open the
+    # caller's files by name — which echo never checks.
+    # It reads the input and writes the output, because a tool may need either permission.
+    class Reopen < HotCell::Operation
+      operation "health.reopen"
+
+      def perform(inputs, outputs)
+        source, = inputs
+        destination, = outputs
+
+        bytes = File.open(source.fd_path, "rb") do |input|
+          File.open(destination.fd_path, "wb") { |output| output.write(input.read) }
+        end
+
+        { bytes: bytes, staged: source.staged? || destination.staged? }
+      end
+    end
+  end
+end

data/lib/hot_cell/server/version.rb

@@ -2,6 +2,6 @@
 
 module HotCell
   module Server
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/hot_cell/supervisor.rb

@@ -191,6 +191,7 @@ module HotCell
       verify_scratches!
       prepare_directories
       preload
+      warm_up
       @work = listen "work.sock"
       @control = listen "control.sock"
       @control_handler = Control.new(configuration: configuration, counters: counters)
@@ -202,6 +203,8 @@ module HotCell
     end
 
     def run
+      prefork
+
       until stopped?
         readable, = IO.select(sources, nil, nil, wait_for)
         Array(readable).each { |source| handle source }
@@ -463,8 +466,20 @@ module HotCell
         @children.each_value.find(&:available?) || spawn
       end
 
+      # Forks a worker into each free slot, so that a request does not wait for `fork`. If a fork fails,
+      # `spawn` logs it and this stops. The next request forks its own worker.
+      def prefork
+        return if @stopping
+
+        while free_slot
+          break unless spawn
+        end
+      end
+
       def spawn
-        number = free_slot or return nil
+        number = free_slot
+        return nil if number.nil?
+
         slot = Slot.build(workspace, number)
         supervisor_side, worker_side = UNIXSocket.pair(:STREAM)
         stderr_reader, stderr_writer = IO.pipe
@@ -857,18 +872,23 @@ module HotCell
       # the sweep must not signal it. An empty group is the common case, so ESRCH is expected. It is safe to
       # kill the group by the leader's pid even though the leader is reaped, because the supervisor is single
       # threaded and mints group leaders only in `spawn`, which cannot run between the `wait2` above and here.
+      #
+      # macOS answers EPERM rather than ESRCH for a group whose only members are zombies, and a tool killed
+      # with its worker stays one until launchd reaps it. Raised, it unwound `run` and ended the cell before
+      # this reap answered the caller. EPERM means no member received the signal, the same outcome as ESRCH.
       def sweep_group(child)
         Process.kill :KILL, -child.pid
-      rescue Errno::ESRCH
+      rescue Errno::ESRCH, Errno::EPERM
         nil
       end
 
       # The whole process group, which is the worker and everything it started. Negative pid is the group.
       # Falls back to the worker alone if the group is already gone, so a worker that died between the check
-      # and the signal is not an error.
+      # and the signal is not an error. A group answering EPERM falls back as well, for the reason
+      # `sweep_group` gives; the bare pid does not, because macOS signals a zombie pid without complaint.
       def kill_group(child)
         Process.kill :KILL, -child.pid
-      rescue Errno::ESRCH
+      rescue Errno::ESRCH, Errno::EPERM
         begin
           Process.kill :KILL, child.pid
         rescue Errno::ESRCH
@@ -936,6 +956,12 @@ module HotCell
 
           log.write "worker.reaped", pid: pid, slot: child.slot.number, served: child.served,
                                      signal: signal_name(status), exit_code: status.exitstatus
+
+          # A worker that exited without serving a request is not replaced. This guards against a worker
+          # that crashes during its startup, for example after a bad deploy. A replacement would crash too,
+          # and the supervisor would fork again, with no requests arriving. Instead, the next request forks
+          # its own worker.
+          prefork if child.served.positive?
         end
       rescue Errno::ECHILD
         nil
@@ -1237,6 +1263,13 @@ module HotCell
         Registry.operations.each { |operation| operation.before_fork.each(&:call) }
       end
 
+      # Runs after `preload`, so that the objects the operations loaded are compacted too. Runs before the
+      # first fork, so that each worker inherits the compacted heap. The compacted objects use fewer pages,
+      # so a worker copies fewer pages when it writes to them.
+      def warm_up
+        Process.warmup
+      end
+
 
       def shutdown
         refuse_queue "the cell is stopping"

data/lib/hot_cell/test_cell.rb

@@ -26,6 +26,9 @@ module HotCell
   # which is the only place such a library may be loaded.
   #
   #   HotCell::TestCell.boot(operations: -> { require "active_storage/hot_cell/server" })
+  #
+  # The cell's sockets go beneath `Dir.tmpdir`, and a Unix socket path holds 104 bytes on macOS, whose per-user
+  # `TMPDIR` spends about half of that. A suite on macOS should set a short `TMPDIR`, such as `/tmp`.
   class TestCell
     READY = "up"
 

data/lib/hot_cell/test_operations.rb

@@ -70,6 +70,16 @@ module HotCell
       end
     end
 
+    # A worker inherits the supervisor's GC counters at the fork. So this reports what the supervisor did to
+    # its heap before the fork.
+    class HeapState < HotCell::Operation
+      operation "test.heap_state"
+
+      def perform(_inputs, _outputs)
+        { compactions: GC.stat(:compact_count) }
+      end
+    end
+
     # Leaves its $HOME in a state the worker cannot remove, by taking write permission off a subdirectory
     # that still has a file in it. A tool running as this user can do the same to a sibling's directory,
     # which is why a removal that fails has to be reported rather than swallowed.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotcell-server
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Mike Dalessio
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 description: |
   Runs a HotCell container. A supervisor listens on two Unix sockets, forks a worker for each request,
   and enforces a wall clock deadline and resource limits on it. Write the work as a subclass of
@@ -43,6 +43,7 @@ files:
 - lib/hot_cell/control.rb
 - lib/hot_cell/counters.rb
 - lib/hot_cell/filesystem.rb
+- lib/hot_cell/health_operations.rb
 - lib/hot_cell/limits.rb
 - lib/hot_cell/log.rb
 - lib/hot_cell/operation.rb
@@ -63,8 +64,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/basecamp/hotcell
-  source_code_uri: https://github.com/basecamp/hotcell/tree/v0.5.0/hotcell-server
-  changelog_uri: https://github.com/basecamp/hotcell/blob/v0.5.0/CHANGELOG.md
+  source_code_uri: https://github.com/basecamp/hotcell/tree/v0.6.0/hotcell-server
+  changelog_uri: https://github.com/basecamp/hotcell/blob/v0.6.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/basecamp/hotcell/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.6
 specification_version: 4
 summary: 'Run a HotCell: the supervisor, the worker, and the operation API.'
 test_files: []