Merge pull request #3337 from bale-cen/master

monitor process exited by signal SIGKILL, clean cgroup resource by th…

Merge pull request #3337 from bale-cen/master
24e84b34 · Christian Brauner · GitHub · c396f8e6 · 8fcb908d · 24e84b34
Unverified Commit 24e84b34 authored Mar 28, 2020 by Christian Brauner Committed by GitHub Mar 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

cgfsng.c src/lxc/cgroups/cgfsng.c +6 -4

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1098,10 +1098,12 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
 			goto try_recursive_destroy;
 		}

-		ret = lxc_write_openat(pivot_path, "cgroup.procs", pidstr, len);
-		if (ret != 0) {
-			SYSWARN("Failed to move monitor %s to \"%s\"", pidstr, pivot_path);
-			continue;
+		if (handler->monitor_pid != 0) {
+			ret = lxc_write_openat(pivot_path, "cgroup.procs", pidstr, len);
+			if (ret != 0) {
+				SYSWARN("Failed to move monitor %s to \"%s\"", pidstr, pivot_path);
+				continue;
+			}
 		}

 try_recursive_destroy: