shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-13 05:44:40 +03:00
Code Activity

service: only fail notify services on empty cgroup during start

Browse Source 
We stay in the SERVICE_START while no READY=1 notification message has
been received. When we are in the SERVICE_START_POST state, we have
already received a ready notification. Hence we should not fail when the
cgroup becomes empty in that state.
This commit is contained in:
Jouke Witteveen
2016-11-24 21:05:47 +01:00
parent 920ec31b5f
commit 71e529fcf1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/service.c
View File

@@ -2579,11 +2579,16 @@ static void service_notify_cgroup_empty_event(Unit *u) {
* SIGCHLD for. */ * SIGCHLD for. */
case SERVICE_START: case SERVICE_START:
case SERVICE_START_POST: if (s->type == SERVICE_NOTIFY) {
if (s->type == SERVICE_NOTIFY)
/* No chance of getting a ready notification anymore */ /* No chance of getting a ready notification anymore */
service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_PROTOCOL); service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_PROTOCOL);
else if (s->pid_file_pathspec) { break;
}
/* Fall through */
case SERVICE_START_POST:
if (s->pid_file_pathspec) {
/* Give up hoping for the daemon to write its PID file */ /* Give up hoping for the daemon to write its PID file */
log_unit_warning(u, "Daemon never wrote its PID file. Failing."); log_unit_warning(u, "Daemon never wrote its PID file. Failing.");