summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuxuan Shui <yshuiv7@gmail.com>2014-02-15 02:38:50 +0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-14 20:47:52 -0500
commite10c9985bbc3cf79f12f9ec7317adfe697fa8214 (patch)
treed0271b53f717e49d46a609c334fab1875d8886b8
parentf928d3263d788da8dec64f06c792988b6076e600 (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.
-rw-r--r--src/core/service.c8
-rw-r--r--src/shared/util.c25
-rw-r--r--src/shared/util.h1
3 files changed, 34 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;
diff --git a/src/shared/util.c b/src/shared/util.c
index 3482b9b743..b1a9db1d46 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -513,6 +513,31 @@ char *truncate_nl(char *s) {
return s;
}
+int get_process_state(pid_t pid) {
+ const char *p;
+ char state;
+ int r;
+ _cleanup_free_ char *line = NULL;
+
+ assert(pid >= 0);
+
+ p = procfs_file_alloca(pid, "stat");
+ r = read_one_line_file(p, &line);
+ if (r < 0)
+ return r;
+
+ p = strrchr(line, ')');
+ if (!p)
+ return -EIO;
+
+ p++;
+
+ if (sscanf(p, " %c", &state) != 1)
+ return -EIO;
+
+ return (unsigned char) state;
+}
+
int get_process_comm(pid_t pid, char **name) {
const char *p;
int r;
diff --git a/src/shared/util.h b/src/shared/util.h
index 9aea3a4e50..8dede1f7ff 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -238,6 +238,7 @@ char *file_in_same_dir(const char *path, const char *filename);
int rmdir_parents(const char *path, const char *stop);
+char get_process_state(pid_t pid);
int get_process_comm(pid_t pid, char **name);
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line);
int get_process_exe(pid_t pid, char **name);