containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9607 from mheon/fix_9523 

Respect NanoCpus in Compat Create
This commit is contained in:
OpenShift Merge Robot 2021-03-04 15:18:53 -05:00 committed by GitHub
parent a26b15265e 8453424e2c
commit 4e5cc6a3a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/common/create_opts.go
View File

@ -397,6 +397,13 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
cliOpts.Ulimit = ulimits cliOpts.Ulimit = ulimits
} }
} }
if cc.HostConfig.Resources.NanoCPUs > 0 {
if cliOpts.CPUPeriod != 0 || cliOpts.CPUQuota != 0 {
return nil, nil, errors.Errorf("NanoCpus conflicts with CpuPeriod and CpuQuota")
}
cliOpts.CPUPeriod = 100000
cliOpts.CPUQuota = cc.HostConfig.Resources.NanoCPUs / 10000
}
// volumes // volumes
volSources := make(map[string]bool) volSources := make(map[string]bool)

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

@ -263,3 +263,12 @@ t GET containers/json 200 \
.[0].Ports[0].Type="tcp" .[0].Ports[0].Type="tcp"
podman stop bar podman stop bar
# Test CPU limit (NanoCPUs)
t POST containers/create '"Image":"'$IMAGE'","HostConfig":{"NanoCpus":500000}' 201 \
.Id~[0-9a-f]\\{64\\}
cid=$(jq -r '.Id' <<<"$output")
t GET containers/$cid/json 200 \
.HostConfig.NanoCpus=500000
t DELETE containers/$cid?v=true 204