From dab5bf859900c0abdbf78c584e4aed42a19768cd Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Sat, 29 Nov 2014 15:27:14 +0000 Subject: [PATCH] cgroup: Handle error when destroying cgroup If a cgroup fails to be destroyed (most likely because there are still processes running as part of a service after the main pid exits), don't free and remove the cgroup unit from the manager. This fixes a regression introduced by the cgroup rework in v205 where systemd would forget about processes still running after the unit becomes inactive. (This can happen when the main pid exits and KillMode=process or none). --- src/core/cgroup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 70fc925b4..af048354e 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -791,8 +791,10 @@ void unit_destroy_cgroup(Unit *u) { return; r = cg_trim_everywhere(u->manager->cgroup_supported, u->cgroup_path, !unit_has_name(u, SPECIAL_ROOT_SLICE)); - if (r < 0) + if (r < 0) { log_debug_errno(r, "Failed to destroy cgroup %s: %m", u->cgroup_path); + return; + } hashmap_remove(u->manager->cgroup_unit, u->cgroup_path); -- 2.30.2