tests/integration/update: enable cpu quota for v2
Also, enable tests of setting quota and period separately in case
systemd cgroup driver is used, as commit 32746fb334
("update: do not overwrite old cpu quota/period") made it possible
to do so.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
parent
32746fb334
commit
7c2b23497e
|
|
@ -236,54 +236,62 @@ EOF
|
|||
check_systemd_value "TasksMax" 20
|
||||
}
|
||||
|
||||
@test "update cgroup v1 cpu limits" {
|
||||
function check_cpu_quota() {
|
||||
local quota=$1
|
||||
local period=$2
|
||||
local sd_quota=$3
|
||||
|
||||
if [ "$CGROUP_UNIFIED" = "yes" ]; then
|
||||
if [ "$quota" = "-1" ]; then
|
||||
quota="max"
|
||||
fi
|
||||
check_cgroup_value "cpu.max" "$quota $period"
|
||||
else
|
||||
check_cgroup_value "cpu.cfs_quota_us" $quota
|
||||
check_cgroup_value "cpu.cfs_period_us" $period
|
||||
fi
|
||||
# systemd value is the same for v1 and v2
|
||||
check_systemd_value "CPUQuotaPerSecUSec" $sd_quota
|
||||
}
|
||||
|
||||
function check_cpu_shares() {
|
||||
local shares=$1
|
||||
|
||||
if [ "$CGROUP_UNIFIED" = "yes" ]; then
|
||||
local weight=$((1 + ((shares - 2) * 9999) / 262142))
|
||||
check_cgroup_value "cpu.weight" $weight
|
||||
check_systemd_value "CPUWeight" $weight
|
||||
else
|
||||
check_cgroup_value "cpu.shares" $shares
|
||||
check_systemd_value "CPUShares" $shares
|
||||
fi
|
||||
}
|
||||
|
||||
@test "update cgroup cpu limits" {
|
||||
[[ "$ROOTLESS" -ne 0 ]] && requires rootless_cgroup
|
||||
requires cgroups_v1
|
||||
|
||||
# run a few busyboxes detached
|
||||
runc run -d --console-socket $CONSOLE_SOCKET test_update
|
||||
[ "$status" -eq 0 ]
|
||||
|
||||
# check that initial values were properly set
|
||||
check_cgroup_value "cpu.cfs_period_us" 1000000
|
||||
check_cgroup_value "cpu.cfs_quota_us" 500000
|
||||
check_systemd_value "CPUQuotaPerSecUSec" 500ms
|
||||
check_cpu_quota 500000 1000000 "500ms"
|
||||
check_cpu_shares 100
|
||||
|
||||
check_cgroup_value "cpu.shares" 100
|
||||
check_systemd_value "CPUShares" 100
|
||||
# update cpu period
|
||||
runc update test_update --cpu-period 900000
|
||||
[ "$status" -eq 0 ]
|
||||
check_cpu_quota 500000 900000 "560ms"
|
||||
|
||||
# systemd driver does not allow to update quota and period separately
|
||||
if [ -z "$RUNC_USE_SYSTEMD" ]; then
|
||||
# update cpu period
|
||||
runc update test_update --cpu-period 900000
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.cfs_period_us" 900000
|
||||
|
||||
# update cpu quota
|
||||
runc update test_update --cpu-quota 600000
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.cfs_quota_us" 600000
|
||||
else
|
||||
# update cpu quota
|
||||
runc update test_update --cpu-quota 600000
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.cfs_quota_us" 600000
|
||||
# this is currently broken
|
||||
#check_systemd_value "CPUQuotaPerSecUSec" 600ms
|
||||
|
||||
# update cpu quota and period together
|
||||
runc update test_update --cpu-period 900000 --cpu-quota 600000
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.cfs_period_us" 900000
|
||||
check_cgroup_value "cpu.cfs_quota_us" 600000
|
||||
check_systemd_value "CPUQuotaPerSecUSec" 670ms
|
||||
fi
|
||||
# update cpu quota
|
||||
runc update test_update --cpu-quota 600000
|
||||
[ "$status" -eq 0 ]
|
||||
check_cpu_quota 600000 900000 "670ms"
|
||||
|
||||
# update cpu-shares
|
||||
runc update test_update --cpu-share 200
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.shares" 200
|
||||
check_systemd_value "CPUShares" 200
|
||||
check_cpu_shares 200
|
||||
|
||||
# Revert to the test initial value via json on stding
|
||||
runc update -r - test_update <<EOF
|
||||
|
|
@ -296,23 +304,14 @@ EOF
|
|||
}
|
||||
EOF
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.cfs_period_us" 1000000
|
||||
check_cgroup_value "cpu.cfs_quota_us" 500000
|
||||
check_systemd_value "CPUQuotaPerSecUSec" 500ms
|
||||
|
||||
check_cgroup_value "cpu.shares" 100
|
||||
check_systemd_value "CPUShares" 100
|
||||
check_cpu_quota 500000 1000000 "500ms"
|
||||
|
||||
# redo all the changes at once
|
||||
runc update test_update \
|
||||
--cpu-period 900000 --cpu-quota 600000 --cpu-share 200
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.cfs_period_us" 900000
|
||||
check_cgroup_value "cpu.cfs_quota_us" 600000
|
||||
check_systemd_value "CPUQuotaPerSecUSec" 670ms
|
||||
|
||||
check_cgroup_value "cpu.shares" 200
|
||||
check_systemd_value "CPUShares" 200
|
||||
check_cpu_quota 600000 900000 "670ms"
|
||||
check_cpu_shares 200
|
||||
|
||||
# reset to initial test value via json file
|
||||
cat << EOF > $BATS_TMPDIR/runc-cgroups-integration-test.json
|
||||
|
|
@ -327,12 +326,8 @@ EOF
|
|||
|
||||
runc update -r $BATS_TMPDIR/runc-cgroups-integration-test.json test_update
|
||||
[ "$status" -eq 0 ]
|
||||
check_cgroup_value "cpu.cfs_period_us" 1000000
|
||||
check_cgroup_value "cpu.cfs_quota_us" 500000
|
||||
check_systemd_value "CPUQuotaPerSecUSec" 500ms
|
||||
|
||||
check_cgroup_value "cpu.shares" 100
|
||||
check_systemd_value "CPUShares" 100
|
||||
check_cpu_quota 500000 1000000 "500ms"
|
||||
check_cpu_shares 100
|
||||
}
|
||||
|
||||
@test "update rt period and runtime" {
|
||||
|
|
|
|||
Loading…
Reference in New Issue