mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
86ba63db82
Fixes an issue where if cpu quota/period is sent via the update API, the values are updated in the stored container data but not actually sent to the running container. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
54 lines
1.1 KiB
Go
54 lines
1.1 KiB
Go
package daemon
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/libcontainerd"
|
|
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
)
|
|
|
|
func toContainerdResources(resources container.Resources) *libcontainerd.Resources {
|
|
var r libcontainerd.Resources
|
|
|
|
r.BlockIO = &specs.LinuxBlockIO{
|
|
Weight: &resources.BlkioWeight,
|
|
}
|
|
|
|
shares := uint64(resources.CPUShares)
|
|
r.CPU = &specs.LinuxCPU{
|
|
Shares: &shares,
|
|
Cpus: resources.CpusetCpus,
|
|
Mems: resources.CpusetMems,
|
|
}
|
|
|
|
var (
|
|
period uint64
|
|
quota int64
|
|
)
|
|
if resources.NanoCPUs != 0 {
|
|
period = uint64(100 * time.Millisecond / time.Microsecond)
|
|
quota = resources.NanoCPUs * int64(period) / 1e9
|
|
}
|
|
if quota == 0 && resources.CPUQuota != 0 {
|
|
quota = resources.CPUQuota
|
|
}
|
|
if period == 0 && resources.CPUPeriod != 0 {
|
|
period = uint64(resources.CPUPeriod)
|
|
}
|
|
|
|
r.CPU.Period = &period
|
|
r.CPU.Quota = "a
|
|
|
|
r.Memory = &specs.LinuxMemory{
|
|
Limit: &resources.Memory,
|
|
Reservation: &resources.MemoryReservation,
|
|
Kernel: &resources.KernelMemory,
|
|
}
|
|
|
|
if resources.MemorySwap > 0 {
|
|
r.Memory.Swap = &resources.MemorySwap
|
|
}
|
|
|
|
return &r
|
|
}
|