1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From: Shengjing Zhu <zhsj@debian.org>
Date: Sun, 27 Feb 2022 23:16:03 +0800
Subject: cri: fix integration test on cgroupsv2 system
Forwarded: https://github.com/containerd/containerd/pull/6595
---
integration/container_update_resources_test.go | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/integration/container_update_resources_test.go b/integration/container_update_resources_test.go
index 1d05800..69f6d81 100644
--- a/integration/container_update_resources_test.go
+++ b/integration/container_update_resources_test.go
@@ -270,11 +270,8 @@ func TestUpdateContainerResources_MemoryLimit(t *testing.T) {
require.NoError(t, err)
t.Log("Check memory limit in cgroup")
- cgroup, err := cgroups.Load(cgroups.V1, cgroups.PidPath(int(task.Pid())))
- require.NoError(t, err)
- stat, err := cgroup.Stat(cgroups.IgnoreNotExist)
- require.NoError(t, err)
- assert.Equal(t, uint64(400*1024*1024), stat.Memory.Usage.Limit)
+ memLimit := getCgroupMemoryLimitForTask(t, task)
+ assert.Equal(t, uint64(400*1024*1024), memLimit)
swapLimit := getCgroupSwapLimitForTask(t, task)
assert.Equal(t, uint64(400*1024*1024), swapLimit)
@@ -291,9 +288,8 @@ func TestUpdateContainerResources_MemoryLimit(t *testing.T) {
checkMemorySwapLimit(t, spec, expectedSwapLimit(800*1024*1024))
t.Log("Check memory limit in cgroup")
- stat, err = cgroup.Stat(cgroups.IgnoreNotExist)
- require.NoError(t, err)
- assert.Equal(t, uint64(800*1024*1024), stat.Memory.Usage.Limit)
+ memLimit = getCgroupMemoryLimitForTask(t, task)
+ assert.Equal(t, uint64(800*1024*1024), memLimit)
swapLimit = getCgroupSwapLimitForTask(t, task)
assert.Equal(t, uint64(800*1024*1024), swapLimit)
}
|
