Skip to content

Commit

Permalink
Revert "increase memory.max in cgroups.bats"
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
lifubang committed Oct 15, 2024
1 parent 34f1d3b commit dedf481
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tests/integration/cgroups.bats
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ convert_hugetlb_size() {
"memory.min": "131072",
"memory.low": "524288",
"memory.high": "5242880",
"memory.max": "20484096",
"memory.max": "10485760",
"memory.swap.max": "20971520",
"pids.max": "99",
"cpu.max": "10000 100000",
Expand All @@ -276,15 +276,15 @@ convert_hugetlb_size() {
echo "$output" | grep -q '^memory.min:131072$'
echo "$output" | grep -q '^memory.low:524288$'
echo "$output" | grep -q '^memory.high:5242880$'
echo "$output" | grep -q '^memory.max:20484096$'
echo "$output" | grep -q '^memory.max:10485760$'
echo "$output" | grep -q '^memory.swap.max:20971520$'
echo "$output" | grep -q '^pids.max:99$'
echo "$output" | grep -q '^cpu.max:10000 100000$'

check_systemd_value "MemoryMin" 131072
check_systemd_value "MemoryLow" 524288
check_systemd_value "MemoryHigh" 5242880
check_systemd_value "MemoryMax" 20484096
check_systemd_value "MemoryMax" 10485760
check_systemd_value "MemorySwapMax" 20971520
check_systemd_value "TasksMax" 99
check_cpu_quota 10000 100000 "100ms"
Expand All @@ -304,7 +304,7 @@ convert_hugetlb_size() {
}
| .linux.resources.unified |= {
"memory.min": "131072",
"memory.max": "40484864",
"memory.max": "10485760",
"pids.max": "42",
"cpu.max": "5000 50000",
"cpu.weight": "42"
Expand All @@ -319,7 +319,7 @@ convert_hugetlb_size() {

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

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

0 comments on commit dedf481

Please sign in to comment.