Skip to content

Linux.Swap is defined as memory+swap combined, while in cgroup v2 swap is a separate value #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Dec 29, 2023
Merged

Linux.Swap is defined as memory+swap combined, while in cgroup v2 swap is a separate value #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cgroup2/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ func ToResources(spec *specs.LinuxResources) *Resources {
resources.Memory = &Memory{}
if swap := mem.Swap; swap != nil {
resources.Memory.Swap = swap
if l := mem.Limit; l != nil {
reduce := *swap - *l
resources.Memory.Swap = &reduce
}
}
if l := mem.Limit; l != nil {
resources.Memory.Max = l
Expand Down
9 changes: 8 additions & 1 deletion cgroup2/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,20 @@ func TestToResources(t *testing.T) {
quota int64 = 8000
period uint64 = 10000
shares uint64 = 5000

mem int64 = 300
swap int64 = 500
)
weight := 1 + ((shares-2)*9999)/262142
res := specs.LinuxResources{CPU: &specs.LinuxCPU{Quota: &quota, Period: &period, Shares: &shares}}
res := specs.LinuxResources{
CPU: &specs.LinuxCPU{Quota: &quota, Period: &period, Shares: &shares},
Memory: &specs.LinuxMemory{Limit: &mem, Swap: &swap},
}
v2resources := ToResources(&res)

assert.Equal(t, weight, *v2resources.CPU.Weight)
assert.Equal(t, CPUMax("8000 10000"), v2resources.CPU.Max)
assert.Equal(t, swap-mem, *v2resources.Memory.Swap)

res2 := specs.LinuxResources{CPU: &specs.LinuxCPU{Period: &period}}
v2resources2 := ToResources(&res2)
Expand Down