Skip to content

Commit dedf481

Browse files
committed
Revert "increase memory.max in cgroups.bats"
As we will fix the race between binary clone and cgroup join, we can eliminate the impacts of memory accounting from ensure_clone_binary. So runc will support lower memory useage the same as before. This reverts commit 719e2bc.
1 parent 34f1d3b commit dedf481

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/integration/cgroups.bats

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ convert_hugetlb_size() {
259259
"memory.min": "131072",
260260
"memory.low": "524288",
261261
"memory.high": "5242880",
262-
"memory.max": "20484096",
262+
"memory.max": "10485760",
263263
"memory.swap.max": "20971520",
264264
"pids.max": "99",
265265
"cpu.max": "10000 100000",
@@ -276,15 +276,15 @@ convert_hugetlb_size() {
276276
echo "$output" | grep -q '^memory.min:131072$'
277277
echo "$output" | grep -q '^memory.low:524288$'
278278
echo "$output" | grep -q '^memory.high:5242880$'
279-
echo "$output" | grep -q '^memory.max:20484096$'
279+
echo "$output" | grep -q '^memory.max:10485760$'
280280
echo "$output" | grep -q '^memory.swap.max:20971520$'
281281
echo "$output" | grep -q '^pids.max:99$'
282282
echo "$output" | grep -q '^cpu.max:10000 100000$'
283283

284284
check_systemd_value "MemoryMin" 131072
285285
check_systemd_value "MemoryLow" 524288
286286
check_systemd_value "MemoryHigh" 5242880
287-
check_systemd_value "MemoryMax" 20484096
287+
check_systemd_value "MemoryMax" 10485760
288288
check_systemd_value "MemorySwapMax" 20971520
289289
check_systemd_value "TasksMax" 99
290290
check_cpu_quota 10000 100000 "100ms"
@@ -304,7 +304,7 @@ convert_hugetlb_size() {
304304
}
305305
| .linux.resources.unified |= {
306306
"memory.min": "131072",
307-
"memory.max": "40484864",
307+
"memory.max": "10485760",
308308
"pids.max": "42",
309309
"cpu.max": "5000 50000",
310310
"cpu.weight": "42"
@@ -319,7 +319,7 @@ convert_hugetlb_size() {
319319

320320
runc exec test_cgroups_unified cat /sys/fs/cgroup/memory.max
321321
[ "$status" -eq 0 ]
322-
[ "$output" = '40484864' ]
322+
[ "$output" = '10485760' ]
323323

324324
runc exec test_cgroups_unified cat /sys/fs/cgroup/pids.max
325325
[ "$status" -eq 0 ]

0 commit comments

Comments
 (0)