Skip to content

Commit 4209439

Browse files
kolyshkinlifubang
authored andcommitted
libct/cg/fs/v2: ignore setting swap in some cases
When swap is being disabled (as set to 0), or set to max, ignore non-existent memory.swap.max cgroup file. If swap is being set explicitly to some value, do return an error like before. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent dbb011e commit 4209439

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

libcontainer/cgroups/fs2/memory.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ func setMemory(dirPath string, r *configs.Resources) error {
5757
// never write empty string to `memory.swap.max`, it means set to 0.
5858
if swapStr != "" {
5959
if err := cgroups.WriteFile(dirPath, "memory.swap.max", swapStr); err != nil {
60-
return err
60+
// If swap is not enabled, silently ignore setting to max or disabling it.
61+
if !(errors.Is(err, os.ErrNotExist) && (swapStr == "max" || swapStr == "0")) {
62+
return err
63+
}
6164
}
6265
}
6366

0 commit comments

Comments
 (0)