skip set cpu.weight when cpu.idle is enabled in cgroups v2

Signed-off-by: axb <[email protected]>
opencontainers · Dec 12, 2023 · d255be9 · d255be9
1 parent 99f7fa1
commit d255be9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libcontainer/cgroups/fs2/cpu.go b/libcontainer/cgroups/fs2/cpu.go
@@ -29,7 +29,8 @@ func setCpu(dirPath string, r *configs.Resources) error {
 	}
 
 	// NOTE: .CpuShares is not used here. Conversion is the caller's responsibility.
-	if r.CpuWeight != 0 {
+	// can not set cpu.weight if cpu.idle is enabled
+	if r.CpuWeight != 0 && (r.CPUIdle == nil || *r.CPUIdle == 0) {
 		if err := cgroups.WriteFile(dirPath, "cpu.weight", strconv.FormatUint(r.CpuWeight, 10)); err != nil {
 			return err
 		}