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 6 additions and 4 deletions
src/lxc/cgroups/cgfsng.c
...@@ -1098,10 +1098,12 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops, ...@@ -1098,10 +1098,12 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
goto try_recursive_destroy; goto try_recursive_destroy;
} }
ret = lxc_write_openat(pivot_path, "cgroup.procs", pidstr, len); if (handler->monitor_pid != 0) {
if (ret != 0) { ret = lxc_write_openat(pivot_path, "cgroup.procs", pidstr, len);
SYSWARN("Failed to move monitor %s to \"%s\"", pidstr, pivot_path); if (ret != 0) {
continue; SYSWARN("Failed to move monitor %s to \"%s\"", pidstr, pivot_path);
continue;
}
} }
try_recursive_destroy: try_recursive_destroy:
......
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