github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-30 08:52:39 +00:00
Code Issues Projects Releases Wiki Activity

runtime: fix handling container spec's memory limit

Browse Source 
The OCI container spec specifies a limit of -1 signifies
unlimited memory. Update the sandbox memory calculator
to reflect this part of the spec.

Fixes: #3512

Signed-off-by: Braden Rayhorn <bradenrayhorn@fastmail.com>
This commit is contained in:
Braden Rayhorn
2022-01-24 13:30:32 -06:00
parent 8a8ae8aae7
commit fc0e095180
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/virtcontainers/sandbox.go
View File

@@ -1989,7 +1989,7 @@ func (s *Sandbox) calculateSandboxMemory() (int64, bool, int64) {
if m := c.Resources.Memory; m != nil { if m := c.Resources.Memory; m != nil {
currentLimit := int64(0) currentLimit := int64(0)
if m.Limit != nil { if m.Limit != nil && *m.Limit > 0 {
currentLimit = *m.Limit currentLimit = *m.Limit
memorySandbox += currentLimit memorySandbox += currentLimit
} }

14
src/runtime/virtcontainers/sandbox_test.go
View File

@@ -178,6 +178,20 @@ func TestCalculateSandboxMem(t *testing.T) {
} }
} }
func TestCalculateSandboxMemHandlesNegativeLimits(t *testing.T) {
sandbox := &Sandbox{}
sandbox.config = &SandboxConfig{}
container := newTestContainerConfigNoop("cont-00001")
limit := int64(-1)
container.Resources.Memory = &specs.LinuxMemory{Limit: &limit}
sandbox.config.Containers = []ContainerConfig{container}
mem, needSwap, swap := sandbox.calculateSandboxMemory()
assert.Equal(t, mem, int64(0))
assert.Equal(t, needSwap, false)
assert.Equal(t, swap, int64(0))
}
func TestCreateSandboxEmptyID(t *testing.T) { func TestCreateSandboxEmptyID(t *testing.T) {
hConfig := newHypervisorConfig(nil, nil) hConfig := newHypervisorConfig(nil, nil)
_, err := testCreateSandbox(t, "", MockHypervisor, hConfig, NetworkConfig{}, nil, nil) _, err := testCreateSandbox(t, "", MockHypervisor, hConfig, NetworkConfig{}, nil, nil)