opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 00:27:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

test/apiv2/20-containers.at: fix NanoCPUs tests on cgroups v1

Browse Source 
* rootful: NanoCpus needs to set more than 10000000 on cgroups v1.
* rootless: Resource limits that include NanoCPUs are not supported and ignored.

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
This commit is contained in:
Toshiki Sonoda
2023-10-18 14:44:27 +09:00
parent b0a45a905b
commit c65d1c02b9
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/apiv2/20-containers.at
View File

@ -470,11 +470,29 @@ t POST containers/prune?filters='{"network":["anynetwork"]}' 500 \
.cause="network is an invalid filter"
# Test CPU limit (NanoCPUs)
t POST containers/create Image=$IMAGE HostConfig='{"NanoCpus":500000}' 201 \
.Id~[0-9a-f]\\{64\\}
nanoCpu=500000
if have_cgroupsv2; then
t POST containers/create Image=$IMAGE HostConfig='{"NanoCpus":500000}' 201 \
.Id~[0-9a-f]\\{64\\}
else
if root; then
# cgroupsv1 rootful : NanoCpus needs to set more than 10000000
t POST containers/create Image=$IMAGE HostConfig='{"NanoCpus":500000}' 500 \
.cause="CPU cfs quota cannot be less than 1ms (i.e. 1000)"
t POST containers/create Image=$IMAGE HostConfig='{"NanoCpus":10000000}' 201 \
.Id~[0-9a-f]\\{64\\}
nanoCpu=10000000
else
# cgroupsv1 rootless : Resource limits that include NanoCPUs are not supported and ignored
t POST containers/create Image=$IMAGE HostConfig='{"NanoCpus":500000}' 201 \
.Id~[0-9a-f]\\{64\\}
nanoCpu=0
fi
fi
cid=$(jq -r '.Id' <<<"$output")
t GET containers/$cid/json 200 \
.HostConfig.NanoCpus=500000
.HostConfig.NanoCpus=$nanoCpu
t DELETE containers/$cid?v=true 204