jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

let runc disable swap in cgroup v2 

In cgroup v2, when memory and memorySwap set to the same value which is greater than zero,
runc should write zero in `memory.swap.max` to disable swap.

Signed-off-by: lifubang <lifubang@acmcoder.com>
This commit is contained in:
lifubang 2020-05-01 22:44:59 +08:00
parent dd8d48ede8
commit a70f354680
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcontainer/cgroups/fs2/memory.go
View File

@ -45,10 +45,13 @@ func setMemory(dirPath string, cgroup *configs.Cgroup) error {
if err != nil {
return err
}
if val := numToStr(swap); val != "" {
if err := fscommon.WriteFile(dirPath, "memory.swap.max", val); err != nil {
return err
}
swapStr := numToStr(swap)
if swapStr == "" && swap == 0 && cgroup.Resources.MemorySwap > 0 {
// memory and memorySwap set to the same value -- disable swap
swapStr = "0"
}
if err := fscommon.WriteFile(dirPath, "memory.swap.max", swapStr); err != nil {
return err
}
if val := numToStr(cgroup.Resources.Memory); val != "" {

12
libcontainer/cgroups/systemd/v2.go
View File

@ -39,12 +39,12 @@ func genV2ResourcesProperties(c *configs.Cgroup) ([]systemdDbus.Property, error)
properties = append(properties,
newProp("MemoryMax", uint64(c.Resources.Memory)))
}
swap, err := cgroups.ConvertMemorySwapToCgroupV2Value(c.Resources.MemorySwap, c.Resources.Memory)
if err != nil {
return nil, err
}
if swap > 0 {
// swap is set
if c.Resources.MemorySwap != 0 {
swap, err := cgroups.ConvertMemorySwapToCgroupV2Value(c.Resources.MemorySwap, c.Resources.Memory)
if err != nil {
return nil, err
}
properties = append(properties,
newProp("MemorySwapMax", uint64(swap)))
}

2
libcontainer/cgroups/utils.go
View File

@ -639,7 +639,7 @@ func ConvertMemorySwapToCgroupV2Value(memorySwap, memory int64) (int64, error) {
return 0, fmt.Errorf("invalid memory value: %d", memory)
}
if memorySwap < memory {
return 0, errors.New("memory+swap limit should be > memory limit")
return 0, errors.New("memory+swap limit should be >= memory limit")
}
return memorySwap - memory, nil