Merge pull request #3208 from pacoxu/patch-2

use memory.min for reservation memory instead of high
google · Jan 5, 2023 · c7714a7 · c7714a7
2 parents 872058f + cbc0586
commit c7714a7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/container/common/helpers.go b/container/common/helpers.go
@@ -172,7 +172,7 @@ func getSpecInternal(cgroupPaths map[string]string, machineInfoFactory info.Mach
 		if cgroup2UnifiedMode {
 			if utils.FileExists(path.Join(memoryRoot, "memory.max")) {
 				spec.HasMemory = true
-				spec.Memory.Reservation = readUInt64(memoryRoot, "memory.high")
+				spec.Memory.Reservation = readUInt64(memoryRoot, "memory.min")
 				spec.Memory.Limit = readUInt64(memoryRoot, "memory.max")
 				spec.Memory.SwapLimit = readUInt64(memoryRoot, "memory.swap.max")
 			}

diff --git a/...est_resources/cgroup_v2/test1/memory.high → ...test_resources/cgroup_v2/test1/memory.min b/...est_resources/cgroup_v2/test1/memory.high → ...test_resources/cgroup_v2/test1/memory.min
diff --git a/...est_resources/cgroup_v2/test2/memory.high → ...test_resources/cgroup_v2/test2/memory.min b/...est_resources/cgroup_v2/test2/memory.high → ...test_resources/cgroup_v2/test2/memory.min