Honour TERM received during supervisor boot before forking workers - #770
Open
rafael-pissardo wants to merge 1 commit into
Open
Honour TERM received during supervisor boot before forking workers#770rafael-pissardo wants to merge 1 commit into
rafael-pissardo wants to merge 1 commit into
Conversation
Signals queued while start hooks run were only drained in the supervise loop, after children had already been forked. Those children still held the inherited enqueue-only trap, so a forwarded TERM was dropped and workers kept claiming jobs until SIGKILL. Drain the queue before each fork, skip supervise when already stopped, and re-arm child handlers immediately after fork.
rosa
force-pushed
the
fix/755-term-during-supervisor-boot
branch
from
August 20, 2026 11:16
9dc4913 to
e775233
Compare
rosa
reviewed
Aug 20, 2026
| # forwarded by the supervisor right after fork is not handled by the | ||
| # inherited enqueue-only supervisor trap (see #755). | ||
| fork do | ||
| register_signal_handlers |
Member
There was a problem hiding this comment.
This feels redundant together with the same call to register_signal_handlers right after running the before_boot callbacks... (see #boot, which runs first thing as part of block.call when running as fork). I think one of those needs to go.
rosa
reviewed
Aug 20, 2026
| def start_processes | ||
| configuration.configured_processes.each { |configured_process| start_process(configured_process) } | ||
| configuration.configured_processes.each do |configured_process| | ||
| # Honour signals that arrived during boot / start hooks before forking |
Member
There was a problem hiding this comment.
This would run for any supervisor even if it doesn't fork (AsyncSupervisor), so I don't think it belongs here.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
TERM/INT/QUIThandlers as the first thing in forked children so a forwarded TERM is not handled by the inherited enqueue-only supervisor trapTERMwhile anon_starthook is still running and asserts workers never start or claim jobsFixes #755.
Test plan
TARGET_DB=sqlite bundle exec ruby -Itest test/integration/supervisor_boot_signal_test.rbTARGET_DB=sqlite bundle exec ruby -Itest test/integration/forked_processes_lifecycle_test.rbTARGET_DB=sqlite bundle exec ruby -Itest test/integration/lifecycle_hooks_test.rbTARGET_DB=sqlite bundle exec ruby -Itest test/unit/fork_supervisor_test.rb