Merge pull request #3075 from brauner/2019-07-03/cgroups

cgroups: hande cpuset initialization race

Merge pull request #3075 from brauner/2019-07-03/cgroups
113ca429 · Stéphane Graber · GitHub · 0f03b155 · b28c2810 · 113ca429
Unverified Commit 113ca429 authored Jul 03, 2019 by Stéphane Graber Committed by GitHub Jul 03, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -612,10 +612,8 @@ static bool cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
 	}

 	/* Already set for us by someone else. */
-	if (v == '1') {
-		DEBUG("\"cgroup.clone_children\" was already set to \"1\"");
-		return true;
-	}
+	if (v == '1')
+		TRACE("\"cgroup.clone_children\" was already set to \"1\"");

 	/* copy parent's settings */
 	if (!copy_parent_file(cgpath, "cpuset.mems")) {