mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-10 21:53:57 +08:00
tests/int: fix flake in "resources.unified override"
As runc binary grows in size over time (new features, more
dependencies) some tests start to flake because of low memory limits.
One such test is "runc run (cgroup v2 resources.unified override)";
it obviously fails because of 1M memory limit:
> runc run failed: unable to start container process: container init was OOM-killed (memory limit too low?)
Increase the limits 4x. Do the same for the "unified only" test.
Fixes issue 5264.
Reported-by: Kevin Berry <kpberry11@gmail.com>
Reported-by: Ricardo Branco <rbranco@suse.de>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 3fabb4d070)
Signed-off-by: lifubang <lifubang@acmcoder.com>
Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
committed by
Rodrigo Campos Catelin
parent
a5e6e351a9
commit
7522b50684
@@ -362,8 +362,8 @@ convert_hugetlb_size() {
|
||||
update_config ' .linux.resources.unified |= {
|
||||
"memory.min": "131072",
|
||||
"memory.low": "524288",
|
||||
"memory.high": "5242880",
|
||||
"memory.max": "10485760",
|
||||
"memory.high": "20971520",
|
||||
"memory.max": "41943040",
|
||||
"pids.max": "99",
|
||||
"cpu.max": "10000 100000",
|
||||
"cpu.weight": "42"
|
||||
@@ -378,15 +378,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:10485760$'
|
||||
echo "$output" | grep -q '^memory.high:20971520$'
|
||||
echo "$output" | grep -q '^memory.max:41943040$'
|
||||
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" 10485760
|
||||
check_systemd_value "MemoryHigh" 20971520
|
||||
check_systemd_value "MemoryMax" 41943040
|
||||
check_systemd_value "TasksMax" 99
|
||||
check_cpu_quota 10000 100000
|
||||
check_cpu_weight 42
|
||||
@@ -428,7 +428,7 @@ convert_hugetlb_size() {
|
||||
}
|
||||
| .linux.resources.unified |= {
|
||||
"memory.min": "131072",
|
||||
"memory.max": "10485760",
|
||||
"memory.max": "41943040",
|
||||
"pids.max": "42",
|
||||
"cpu.max": "5000 50000",
|
||||
"cpu.weight": "42"
|
||||
@@ -443,7 +443,7 @@ convert_hugetlb_size() {
|
||||
|
||||
runc exec test_cgroups_unified cat /sys/fs/cgroup/memory.max
|
||||
[ "$status" -eq 0 ]
|
||||
[ "$output" = '10485760' ]
|
||||
[ "$output" = '41943040' ]
|
||||
|
||||
runc exec test_cgroups_unified cat /sys/fs/cgroup/pids.max
|
||||
[ "$status" -eq 0 ]
|
||||
|
||||
Reference in New Issue
Block a user