From cbc058694a867b1b485546117a56ad38f28e8629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paco=20Xu=20=E5=BE=90=E4=BF=8A=E6=9D=B0?= Date: Fri, 2 Dec 2022 14:58:19 +0800 Subject: [PATCH] use memory.min for reservation memory instead of high high is throttling bar --- container/common/helpers.go | 2 +- .../test_resources/cgroup_v2/test1/{memory.high => memory.min} | 0 .../test_resources/cgroup_v2/test2/{memory.high => memory.min} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename container/common/test_resources/cgroup_v2/test1/{memory.high => memory.min} (100%) rename container/common/test_resources/cgroup_v2/test2/{memory.high => memory.min} (100%) diff --git a/container/common/helpers.go b/container/common/helpers.go index e028f279cf..7248f3b0b8 100644 --- 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/container/common/test_resources/cgroup_v2/test1/memory.high b/container/common/test_resources/cgroup_v2/test1/memory.min similarity index 100% rename from container/common/test_resources/cgroup_v2/test1/memory.high rename to container/common/test_resources/cgroup_v2/test1/memory.min diff --git a/container/common/test_resources/cgroup_v2/test2/memory.high b/container/common/test_resources/cgroup_v2/test2/memory.min similarity index 100% rename from container/common/test_resources/cgroup_v2/test2/memory.high rename to container/common/test_resources/cgroup_v2/test2/memory.min