additional cgroup testing and implementation of cpu-shares (weight in…

… systemd) Signed-off-by: Charlie Doern <cdoern@redhat.com>
containers · Jul 1, 2022 · ae2b542 · ae2b542
1 parent 178929c
commit ae2b542
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/cgroups/cgroups_linux_test.go b/pkg/cgroups/cgroups_linux_test.go
@@ -45,6 +45,9 @@ func TestResources(t *testing.T) {
 	var resources configs.Resources
 	resources.CpuPeriod = 100000
 	resources.CpuQuota = 100000
+	resources.CpuShares = 100
+	resources.CpusetCpus = "0"
+	resources.CpusetMems = "0"
 	resources.Memory = 900
 	resources.MemorySwap = 1000
 	resources.BlkioWeight = 300

diff --git a/pkg/cgroups/systemd_linux.go b/pkg/cgroups/systemd_linux.go
@@ -140,6 +140,12 @@ func resourcesToProps(res *configs.Resources) (map[string]uint64, map[string]str
 		uMap["CPUQuotaPerSecUSec"] = cpuQuotaPerSecUSec
 	}
 
+	if res.CpuShares != 0 {
+		// convert from shares to weight. weight only supports 1-10000
+		wt := (1 + ((res.CpuShares-2)*9999)/262142)
+		uMap["CPUWeight"] = wt
+	}
+
 	// CPUSet
 	if res.CpusetCpus != "" {
 		bits := []byte(res.CpusetCpus)