From dd305ec9c6c2ef6e0b5e43de388a98825385b359 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 28 Apr 2015 12:20:29 +0200 Subject: core: when we cannot add PID to a scope cgroup, log about it Also, place the scope unit in failed state. --- src/core/scope.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/core/scope.c') diff --git a/src/core/scope.c b/src/core/scope.c index 1c3c6bb540..1848641d81 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -277,6 +277,7 @@ static int scope_start(Unit *u) { if (s->state == SCOPE_FAILED) return -EPERM; + /* We can't fulfill this right now, please try again later */ if (s->state == SCOPE_STOP_SIGTERM || s->state == SCOPE_STOP_SIGKILL) return -EAGAIN; @@ -290,8 +291,11 @@ static int scope_start(Unit *u) { (void) unit_reset_cpu_usage(u); r = unit_attach_pids_to_cgroup(u); - if (r < 0) + if (r < 0) { + log_unit_warning_errno(UNIT(s)->id, r, "%s: Failed to add PIDs to scope's control group: %m", UNIT(s)->id); + scope_enter_dead(s, SERVICE_FAILURE_RESOURCES); return r; + } s->result = SCOPE_SUCCESS; -- cgit v1.2.3-54-g00ecf