Set minimal shares for containers with no cpu specified

This commit is contained in:
Dawn Chen
2015-07-01 16:37:14 -07:00
parent 3597344459
commit 4b85e02504

View File

@@ -306,8 +306,10 @@ func ConnectToDockerOrDie(dockerEndpoint string) DockerInterface {
func milliCPUToShares(milliCPU int64) int64 { func milliCPUToShares(milliCPU int64) int64 {
if milliCPU == 0 { if milliCPU == 0 {
// zero milliCPU means unset. Use kernel default. // Docker converts zero milliCPU to unset, which maps to kernel default
return 0 // for unset: 1024. Return 2 here to really match kernel default for
// zero milliCPU.
return 2
} }
// Conceptually (milliCPU / milliCPUToCPU) * sharesPerCPU, but factored to improve rounding. // Conceptually (milliCPU / milliCPUToCPU) * sharesPerCPU, but factored to improve rounding.
shares := (milliCPU * sharesPerCPU) / milliCPUToCPU shares := (milliCPU * sharesPerCPU) / milliCPUToCPU