-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Better monitoring of forked Puma processes
3d3d5b3 introduced running Puma processes as child forks. The fix was necessary but it doesn't monitor the process state properly. What if `after(:suite)` block is not executed at all and child process becomes a zombie? What if fork process refuses to exit for some reason? So I have introduced a `Fork` helper that tries to prevent forks from becoming a zombie by sending it `SIGKILL` if `SIGTERM` didn't have an effect in 500ms or when Ruby interpreter terminates completely (`at_exit`).
- Loading branch information
1 parent
4bc6631
commit 11941fe
Showing
2 changed files
with
80 additions
and
7 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
require 'thread' | ||
|
||
class Fork | ||
def initialize(&block) | ||
@mu = Mutex.new | ||
@cond = ConditionVariable.new | ||
@pstate = nil | ||
@pid = Process.fork(&block) | ||
@killed = false | ||
|
||
# Start monitoring the PID. | ||
Thread.new { monitor } | ||
|
||
# Kill the process anyway when the program exits. | ||
ppid = Process.pid | ||
at_exit do | ||
if ppid == Process.pid # Make sure we are not inside another fork spawned by rspec example. | ||
do_kill("KILL") | ||
end | ||
end | ||
end | ||
|
||
# Wait for process to exit. | ||
def wait(timeout = nil) | ||
@mu.synchronize do | ||
next @pstate unless @pstate.nil? | ||
|
||
@cond.wait(@mu, timeout) | ||
@pstate | ||
end | ||
end | ||
|
||
# Signal the process. | ||
def kill(sig) | ||
already_killed = @mu.synchronize do | ||
old = @killed | ||
@killed = true | ||
old | ||
end | ||
signaled = do_kill(sig) | ||
Thread.new { reaper } if signaled && !already_killed | ||
signaled | ||
end | ||
|
||
private | ||
|
||
# Signal the process. | ||
def do_kill(sig) | ||
Process.kill(sig, @pid) | ||
true | ||
rescue Errno::ESRCH # No such process | ||
false | ||
end | ||
|
||
# Monitor the process state. | ||
def monitor | ||
_, pstate = Process.wait2(@pid) | ||
|
||
@mu.synchronize do | ||
@pstate = pstate | ||
@cond.broadcast | ||
end | ||
end | ||
|
||
# Wait 500 milliseconds and force terminate. | ||
def reaper | ||
pstate = wait(0.5) | ||
do_kill("KILL") unless pstate | ||
end | ||
end |