shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-09-22 13:45:21 +03:00
Code Activity

cgroup-util: Properly handle conditions where cgroup.threads is empty after SIGKILL but processes still remain

Browse Source 
After sending a SIGKILL to a process, the process might disappear from
`cgroup.threads` but still show up in `cgroup.procs` and still remains in the
cgroup and cause migrating new processes to `Delegate=yes` cgroups to fail with
`-EBUSY`. This is especially likely for heavyweight processes that consume more
kernel CPU time to clean up.

Fix this by only returning 0 when both `cgroup.threads` and
`cgroup.procs` are empty.
This commit is contained in:
msizanoen1
2022-05-30 22:08:07 +07:00
committed by Yu Watanabe
parent 9a18321058
commit 37f0289bf5
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/basic/cgroup-util.c
View File

@@ -357,20 +357,29 @@ int cg_kill(
Set *s, Set *s,
cg_kill_log_func_t log_kill, cg_kill_log_func_t log_kill,
void *userdata) { void *userdata) {
int r;
int r, ret;
r = cg_kill_items(controller, path, sig, flags, s, log_kill, userdata, "cgroup.procs"); r = cg_kill_items(controller, path, sig, flags, s, log_kill, userdata, "cgroup.procs");
if (r < 0 || sig != SIGKILL) if (r < 0 || sig != SIGKILL)
return r; return r;
ret = r;
/* Only in case of killing with SIGKILL and when using cgroupsv2, kill remaining threads manually as /* Only in case of killing with SIGKILL and when using cgroupsv2, kill remaining threads manually as
a workaround for kernel bug. It was fixed in 5.2-rc5 (c03cd7738a83), backported to 4.19.66 a workaround for kernel bug. It was fixed in 5.2-rc5 (c03cd7738a83), backported to 4.19.66
(4340d175b898) and 4.14.138 (feb6b123b7dd). */ (4340d175b898) and 4.14.138 (feb6b123b7dd). */
r = cg_unified_controller(controller); r = cg_unified_controller(controller);
if (r <= 0) if (r < 0)
return r;
if (r == 0)
return ret;
r = cg_kill_items(controller, path, sig, flags, s, log_kill, userdata, "cgroup.threads");
if (r < 0)
return r; return r;
return cg_kill_items(controller, path, sig, flags, s, log_kill, userdata, "cgroup.threads"); return r > 0 || ret > 0;
} }
int cg_kill_kernel_sigkill(const char *controller, const char *path) { int cg_kill_kernel_sigkill(const char *controller, const char *path) {