diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json new file mode 100644 index 00000000..de512861 --- /dev/null +++ b/.devcontainer/devcontainer-lock.json @@ -0,0 +1,9 @@ +{ + "features": { + "ghcr.io/devcontainers/features/github-cli:1": { + "version": "1.1.3", + "resolved": "ghcr.io/devcontainers/features/github-cli@sha256:bd7ab48a832228f633239277552c30b353867fef2e5b037e064b4e64f0b843f2", + "integrity": "sha256:bd7ab48a832228f633239277552c30b353867fef2e5b037e064b4e64f0b843f2" + } + } +} diff --git a/CHANGELOG.md b/CHANGELOG.md index cb9d6239..ec3f9ef0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +- Preserve worker spawn deadlines when the mold starts workers. + # 0.18.4 - Avoid stale body source pointers when Ruby compacts strings. diff --git a/lib/pitchfork/http_server.rb b/lib/pitchfork/http_server.rb index a9a54bfd..5056e098 100644 --- a/lib/pitchfork/http_server.rb +++ b/lib/pitchfork/http_server.rb @@ -847,8 +847,10 @@ def spawn_missing_workers generation = 0 end + # Only the monitor resets shared state; the mold attaches to the same slots. if @before_service_worker_ready && !@children.service service = Worker.new(nil, service: true, version: version, generation: generation) + service.reset_state! spawn_service_from_mold(service) end @@ -861,7 +863,9 @@ def spawn_missing_workers next end - missing_workers << Worker.new(worker_nr, version: version, generation: generation) + worker = Worker.new(worker_nr, version: version, generation: generation) + worker.reset_state! + missing_workers << worker end unless missing_workers.empty? diff --git a/lib/pitchfork/worker.rb b/lib/pitchfork/worker.rb index 2b1b9e59..4ec7d81f 100644 --- a/lib/pitchfork/worker.rb +++ b/lib/pitchfork/worker.rb @@ -34,7 +34,13 @@ def initialize(nr, pid: nil, generation: 0, version: 0, service: false) @monitor = nil @exiting = false @requests_count = 0 - init_state + if nr + @state_drop = SharedMemory.worker_state(@nr) + elsif service? + @state_drop = SharedMemory.service_state + else + promoted!(nil) + end end def init_with(data) @@ -306,6 +312,10 @@ def close # :nodoc: @to_io = nil end + def reset_state! + @state_drop.reset! + end + def reaped! close # Not ideal: All molds share two state_drops, so when reaping a mold @@ -314,7 +324,7 @@ def reaped! # unix sockets, we could consider assigning a unique page for each mold to solve # this problem. unless mold? - @state_drop.reset! + reset_state! end end @@ -342,18 +352,6 @@ def to_log private - def init_state - if nr - @state_drop = SharedMemory.worker_state(@nr) - @state_drop.reset! - elsif service? - @state_drop = SharedMemory.service_state - @state_drop.reset! - else - promoted!(nil) - end - end - def pipe=(socket) raise ArgumentError, "pipe can't be nil" unless socket Info.keep_io(socket) diff --git a/test/integration/test_boot.rb b/test/integration/test_boot.rb index 4bbdb813..c30db58f 100644 --- a/test/integration/test_boot.rb +++ b/test/integration/test_boot.rb @@ -211,6 +211,13 @@ module SlowSpawnWorkerPatch def spawn_worker(worker) @_spawn_worker_count ||= 0 @_spawn_worker_count += 1 + if @_spawn_worker_count == 1 + File.write("first-spawn-pending", "") + deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + 8 + until File.exist?("release-first-spawn") || Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline + sleep 0.01 + end + end super end @@ -226,9 +233,23 @@ def init_worker_process(worker) after_mold_fork do |server, _mold| server.extend(SlowSpawnWorkerPatch) end + + after_monitor_ready do |server| + def server.murder_lazy_workers + if children.workers_count > 0 && !@checked_first_spawn + deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + 5 + until File.exist?("first-spawn-pending") || Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline + sleep 0.01 + end + @checked_first_spawn = true + end + super + end + end RUBY assert_stderr(/worker=0 gen=0.0 timed out during spawn, abandoning/, timeout: 5) + File.write("release-first-spawn", "") assert_stderr(/worker=0 gen=0.0 pid=(\d+) spawned but slot is taken/, timeout: 5) abandoned_worker_pid = read_stderr.match(/worker=0 gen=0.0 pid=(\d+) spawned but slot is taken/)[1] diff --git a/test/unit/test_worker.rb b/test/unit/test_worker.rb index c98f1bc8..a59b38cd 100644 --- a/test/unit/test_worker.rb +++ b/test/unit/test_worker.rb @@ -18,6 +18,25 @@ def test_create_many_workers end end + def test_new_worker_keeps_shared_state_until_reset + [[0, false], [nil, true]].each do |nr, service| + existing = Worker.new(nr, service: service) + existing.deadline = 123 + existing.ready = true + existing.busy = true + + worker = Worker.new(nr, service: service) + assert_equal 123, worker.deadline + assert worker.ready? + assert worker.busy? + + worker.reset_state! + assert_equal 0, existing.deadline + refute existing.ready? + refute existing.busy? + end + end + def test_shared_process worker = Worker.new(0) _, status = Process.waitpid2(fork { worker.deadline += 1; exit!(0) })