Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 5 additions & 1 deletion lib/pitchfork/http_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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?
Expand Down
26 changes: 12 additions & 14 deletions lib/pitchfork/worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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)
Expand Down
21 changes: 21 additions & 0 deletions test/integration/test_boot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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]
Expand Down
19 changes: 19 additions & 0 deletions test/unit/test_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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) })
Expand Down
Loading