diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index 51725d8f..0893248a 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -173,6 +173,9 @@ All relevant changes are documented in this file. reported as running, with its conditions set, when another process wrote that PID file, e.g., a container started by hand with podman. Found by Mattias Walström +- Fix `initctl stop` of a forking service before it had written its PID + file. The PID file showing up later undid the stop and the service was + reported running. Now the late daemon is stopped instead - Fix a command whose name starts like a service option, e.g. `logger` or `pidof`. It was taken as the `log` or `pid` option and the next argument ran as the command, which also broke the `logger` example in finit.conf(5) diff --git a/plugins/pidfile.c b/plugins/pidfile.c index b791966c..4f3c183b 100644 --- a/plugins/pidfile.c +++ b/plugins/pidfile.c @@ -139,9 +139,6 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask) return; } - /* Service is not crashing, let's tell state machine! */ - service_forked(svc); - if (pid != svc->pid) { dbg("Forking service %s (cmd %s) changed PID from %d to %d", svc_ident(svc, NULL, 0), svc->cmd, svc->pid, pid); @@ -151,6 +148,10 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask) logit(LOG_CONSOLE | LOG_NOTICE, "Started %s[%d]", svc_ident(svc, NULL, 0), pid); cgroup_move_svc(svc); } + + /* Service is not crashing, let's tell state machine! */ + if (!service_forked(svc)) + return; } if (svc->notify == SVC_NOTIFY_PID) diff --git a/src/service.c b/src/service.c index 5bda279f..faaa70e5 100644 --- a/src/service.c +++ b/src/service.c @@ -3360,16 +3360,26 @@ static void svc_set_state(svc_t *svc, svc_state_t new_state) /* * Called by pidfile plugin for forking services that have successfully started. * We get here when the service_monitor() collects the PID, sets svc->pid to 0, - * and the state machine prepares for the worst bu setting state to HALTED. + * and the state machine prepares for the worst by setting state to HALTED. + * + * Returns 1 if the service is now running, 0 if it was stopped or disabled + * while waiting for its PID file, then the late daemon is stopped. */ -void service_forked(svc_t *svc) +int service_forked(svc_t *svc) { /* Stop forking_retry() timer */ service_timeout_cancel(svc); - /* Not crashing, restore RUNNING state */ - svc_unblock(svc); + /* Not crashing, restore RUNNING state, but keep a user stop */ + if (!svc_is_stopped(svc)) + svc_unblock(svc); svc_set_state(svc, SVC_RUNNING_STATE); + + /* Follow-up to issue #452, RUNNING and not enabled -> service_stop() */ + if (!svc_enabled(svc)) + service_step(svc); + + return svc_is_running(svc); } /* Set or clear service/foo/ready condition for services and call optional ready:script */ diff --git a/src/service.h b/src/service.h index 6277cf95..e5a0d283 100644 --- a/src/service.h +++ b/src/service.h @@ -58,7 +58,7 @@ int service_timeout_after (svc_t *svc, int timeout, void (*cb)(svc_t *svc int service_timeout_cancel (svc_t *svc); void compose_cmdline (svc_t *svc, char *buf, size_t len); -void service_forked (svc_t *svc); +int service_forked (svc_t *svc); void service_ready (svc_t *svc, int ready); int service_stop (svc_t *svc); diff --git a/test/pidfile-stopped.sh b/test/pidfile-stopped.sh index d38f1c4f..2b5a7b37 100755 --- a/test/pidfile-stopped.sh +++ b/test/pidfile-stopped.sh @@ -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" < $FINIT_CONF" +run "initctl reload" +run "initctl stop ext" + +retry 'assert_file_exists /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