github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6595 from zhsj/fix-cri-test

Browse Source 
cri: fix integration test on cgroupsv2 system
This commit is contained in:
Phil Estes 2022-03-04 13:20:45 -05:00 committed by GitHub
commit 5427aec4f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
integration/container_update_resources_test.go
View File

@ -260,11 +260,8 @@ func TestUpdateContainerResources_MemoryLimit(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
t.Log("Check memory limit in cgroup") t.Log("Check memory limit in cgroup")
cgroup, err := cgroups.Load(cgroups.V1, cgroups.PidPath(int(task.Pid()))) memLimit := getCgroupMemoryLimitForTask(t, task)
require.NoError(t, err) assert.Equal(t, uint64(400*1024*1024), memLimit)
stat, err := cgroup.Stat(cgroups.IgnoreNotExist)
require.NoError(t, err)
assert.Equal(t, uint64(400*1024*1024), stat.Memory.Usage.Limit)
t.Log("Update container memory limit after started") t.Log("Update container memory limit after started")
err = runtimeService.UpdateContainerResources(cn, &runtime.LinuxContainerResources{ err = runtimeService.UpdateContainerResources(cn, &runtime.LinuxContainerResources{
@ -278,7 +275,6 @@ func TestUpdateContainerResources_MemoryLimit(t *testing.T) {
checkMemoryLimit(t, spec, 800*1024*1024) checkMemoryLimit(t, spec, 800*1024*1024)
t.Log("Check memory limit in cgroup") t.Log("Check memory limit in cgroup")
stat, err = cgroup.Stat(cgroups.IgnoreNotExist) memLimit = getCgroupMemoryLimitForTask(t, task)
require.NoError(t, err) assert.Equal(t, uint64(800*1024*1024), memLimit)
assert.Equal(t, uint64(800*1024*1024), stat.Memory.Usage.Limit)
} }