github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #687 from rjnagal/master

Browse Source 
Fix handling of default cpu shares.
This commit is contained in:
Victor Marmol 2014-07-29 12:06:50 -07:00
commit a21cec0fc4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet.go
View File

@ -242,6 +242,10 @@ func makePortsAndBindings(container *api.Container) (map[docker.Port]struct{}, m
} }
func milliCPUToShares(milliCPU int) int { func milliCPUToShares(milliCPU int) int {
if milliCPU == 0 {
// zero milliCPU means unset. Use kernel default.
return 0
}
// 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
if shares < minShares { if shares < minShares {