mirror of https://github.com/containers/podman.git
Merge pull request #9607 from mheon/fix_9523
Respect NanoCpus in Compat Create
This commit is contained in:
commit
4e5cc6a3a6
|
@ -397,6 +397,13 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup
|
|||
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
|
||||
volSources := make(map[string]bool)
|
||||
|
|
|
@ -263,3 +263,12 @@ t GET containers/json 200 \
|
|||
.[0].Ports[0].Type="tcp"
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue