mirror of
https://github.com/troglobit/finit.git
synced 2026-11-17 19:30:29 +00:00
service: keep a stop of a forking service waiting for its PID file
Stopping a forking service after its start script had exited, but
before the daemon had written its PID file, did not hold. When the
PID file showed up, the service was reported running again and the
daemon was left alone:
initctl stop ext
service_forked() cleared any block on the service, the user's stop
included.
Keep a user stop, and let the state machine stop the late daemon of
a service no longer enabled. The service is briefly RUNNING on its
way to STOPPING, so service/NAME/running blinks on and off.
Follow-up to #452
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
(cherry picked from commit 35c313c2fa)
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
5 files changed
+47
-9
No files matched your search
+25
-1
@@ -21,7 +21,7 @@ external()
|
||||
cleanup()
|
||||
{
|
||||
run "kill \$(cat $PIDFN 2>/dev/null) 2>/dev/null || true"
|
||||
run "rm -f $PIDFN"
|
||||
run "rm -f $PIDFN /bin/late.sh /tmp/late"
|
||||
}
|
||||
|
||||
test_teardown()
|
||||
@@ -58,3 +58,27 @@ retry 'assert_status ext waiting'
|
||||
external
|
||||
assert_status ext waiting
|
||||
assert_nocond pid/ext
|
||||
cleanup
|
||||
|
||||
# A forking daemon whose launcher exits before the daemon has written
|
||||
# its PID file. A stop in that window must hold, and the daemon that
|
||||
# shows up late must be stopped, not adopted as running.
|
||||
sep
|
||||
say 'A forking service stopped before its PID file appears stays stopped'
|
||||
# Unquoted END, $PIDFN expands here. /tmp/late marks the daemon start
|
||||
cat > "$SYSROOT/bin/late.sh" <<END
|
||||
#!/bin/sh
|
||||
( sleep 1; touch /tmp/late; exec serv -n -p -P $PIDFN ) &
|
||||
END
|
||||
chmod +x "$SYSROOT/bin/late.sh"
|
||||
run "echo 'service name:ext pid:!$PIDFN late.sh -- Late' > $FINIT_CONF"
|
||||
run "initctl reload"
|
||||
run "initctl stop ext"
|
||||
|
||||
retry 'texec test -e /tmp/late'
|
||||
|
||||
# Negative check, give the pidfile plugin time to (not) react
|
||||
sleep 1
|
||||
assert_status ext stopped
|
||||
assert_nocond pid/ext
|
||||
assert_num_children 0 serv
|
||||
Reference in new issue
Block a user