diff options
| author | Yuxuan Shui <yshuiv7@gmail.com> | 2014-02-15 02:38:50 +0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-02-14 20:47:52 -0500 |
| commit | e10c9985bbc3cf79f12f9ec7317adfe697fa8214 (patch) | |
| tree | d0271b53f717e49d46a609c334fab1875d8886b8 /src/core | |
| parent | f928d3263d788da8dec64f06c792988b6076e600 (diff) | |
core: fix detection of dead processes
Commit 5ba6985b moves the UNIT_VTABLE(u)->sigchld_event before systemd
actually reaps the zombie. Which leads to service_load_pid_file accepting
zombie as a valid pid.
This fixes timeouts like:
[ 2746.602243] systemd[1]: chronyd.service stop-sigterm timed out. Killing.
[ 2836.852545] systemd[1]: chronyd.service still around after SIGKILL. Ignoring.
[ 2927.102187] systemd[1]: chronyd.service stop-final-sigterm timed out. Killing.
[ 3017.352560] systemd[1]: chronyd.service still around after final SIGKILL. Entering failed mode.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/service.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/service.c b/src/core/service.c index 51297846f9..3a2ef01570 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1376,6 +1376,14 @@ static int service_load_pid_file(Service *s, bool may_warn) { return -ESRCH; } + if (get_process_state(pid) == 'Z') { + if (may_warn) + log_info_unit(UNIT(s)->id, + "PID "PID_FMT" read from file %s is a zombie.", + pid, s->pid_file); + return -ESRCH; + } + if (s->main_pid_known) { if (pid == s->main_pid) return 0; |