Skip to content

L
lxc
Unverified Commit 24e84b34 by Christian Brauner Committed by GitHub
Options

Merge pull request #3337 from bale-cen/master

monitor process exited by signal SIGKILL, clean cgroup resource by th…
parents c396f8e6 8fcb908d
Showing with 2 additions and 0 deletions
src/lxc/cgroups/cgfsng.c
...@@ -1098,11 +1098,13 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops, ...@@ -1098,11 +1098,13 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
goto try_recursive_destroy; goto try_recursive_destroy;
} }
if (handler->monitor_pid != 0) {
ret = lxc_write_openat(pivot_path, "cgroup.procs", pidstr, len); ret = lxc_write_openat(pivot_path, "cgroup.procs", pidstr, len);
if (ret != 0) { if (ret != 0) {
SYSWARN("Failed to move monitor %s to \"%s\"", pidstr, pivot_path); SYSWARN("Failed to move monitor %s to \"%s\"", pidstr, pivot_path);
continue; continue;
} }
}
try_recursive_destroy: try_recursive_destroy:
ret = recursive_destroy(h->monitor_full_path); ret = recursive_destroy(h->monitor_full_path);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment