Skip to content

Fix before_worker_exit #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2025
Merged

Fix before_worker_exit #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Unreleased

- Fix a regression introduced in `0.17.0` causing `before_worker_exit` to often not be called.
- Implemented the `max_consecutive_spawn_errors` configuration. Purely opt-in for now.

# 0.17.0
Expand Down
4 changes: 2 additions & 2 deletions lib/pitchfork/http_server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,8 +1186,6 @@ def prepare_timeout(worker)
FORK_TIMEOUT = 5

def fork_sibling(role, &block)
reset_signal_handlers

if REFORKING_AVAILABLE
r, w = Pitchfork::Info.keep_ios(IO.pipe)
# We double fork so that the new worker is re-attached back
Expand All @@ -1211,6 +1209,8 @@ def fork_sibling(role, &block)
raise ForkFailure, "fork_sibling didn't succeed in #{FORK_TIMEOUT} seconds"
end
else # first child
reset_signal_handlers

r.close
Process.setproctitle("<pitchfork fork_sibling(#{role})>")
pid = Pitchfork.clean_fork(setpgid: setpgid) do
Expand Down
5 changes: 5 additions & 0 deletions test/integration/test_reforking.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ def test_reforking
worker_processes 2
refork_after [5, 5]
refork_max_unavailable 1

before_worker_exit do |server, worker|
server.logger.info("clean_exit worker=\#{worker.nr}")
end
CONFIG

assert_healthy("http://#{addr}:#{port}")
Expand All @@ -23,6 +27,7 @@ def test_reforking

assert_stderr "refork condition met, promoting ourselves", timeout: 3
assert_stderr "Terminating old mold gen=0 pid="
assert_stderr(/clean_exit worker=0/)
assert_stderr(/worker=0 gen=1 pid=\d+ ready/)
assert_stderr(/worker=1 gen=1 pid=\d+ ready/)

Expand Down