mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
6102243692
This fix tries to address the issue raised in 31032 where it was not possible to specify `--cpus` for `docker update`. This fix adds `--cpus` support for `docker update`. In case both `--cpus` and `--cpu-period/--cpu-quota` have been specified, an error will be returned. Related docs has been updated. Integration tests have been added. This fix fixes 31032. This fix is related to 27921, 27958. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
32 lines
927 B
Go
32 lines
927 B
Go
// +build linux
|
|
|
|
package daemon
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/libcontainerd"
|
|
)
|
|
|
|
func toContainerdResources(resources container.Resources) libcontainerd.Resources {
|
|
var r libcontainerd.Resources
|
|
r.BlkioWeight = uint64(resources.BlkioWeight)
|
|
r.CpuShares = uint64(resources.CPUShares)
|
|
if resources.NanoCPUs != 0 {
|
|
r.CpuPeriod = uint64(100 * time.Millisecond / time.Microsecond)
|
|
r.CpuQuota = uint64(resources.NanoCPUs) * r.CpuPeriod / 1e9
|
|
} else {
|
|
r.CpuPeriod = uint64(resources.CPUPeriod)
|
|
r.CpuQuota = uint64(resources.CPUQuota)
|
|
}
|
|
r.CpusetCpus = resources.CpusetCpus
|
|
r.CpusetMems = resources.CpusetMems
|
|
r.MemoryLimit = uint64(resources.Memory)
|
|
if resources.MemorySwap > 0 {
|
|
r.MemorySwap = uint64(resources.MemorySwap)
|
|
}
|
|
r.MemoryReservation = uint64(resources.MemoryReservation)
|
|
r.KernelMemoryLimit = uint64(resources.KernelMemory)
|
|
return r
|
|
}
|