Merge pull request #293 from zhuangqh/fix/v2-cpuset-ctrl

cgroup2: only enable the cpuset controller if cpus or mems is specified
containerd · May 10, 2023 · 474049b · 474049b
2 parents dcd0bca + 46d9229
commit 474049b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cgroup2/manager.go b/cgroup2/manager.go
@@ -96,7 +96,9 @@ func (r *Resources) Values() (o []Value) {
 func (r *Resources) EnabledControllers() (c []string) {
 	if r.CPU != nil {
 		c = append(c, "cpu")
-		c = append(c, "cpuset")
+		if r.CPU.Cpus != "" || r.CPU.Mems != "" {
+			c = append(c, "cpuset")
+		}
 	}
 	if r.Memory != nil {
 		c = append(c, "memory")