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

Merge pull request #106570 from odinuge/fix-cpu-shares-on-big-systems

Browse Source 
Fix cpu share issues on systems with large amounts of cpu
This commit is contained in:
Kubernetes Prow Robot 2022-03-01 10:15:55 -08:00 committed by GitHub
commit 0e8e307567
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubelet/kuberuntime/helpers_linux.go
View File

@ -20,9 +20,6 @@ limitations under the License.
package kuberuntime package kuberuntime
const ( const (
// Taken from lmctfy https://github.com/google/lmctfy/blob/master/lmctfy/controllers/cpu_controller.cc
minShares = 2
sharesPerCPU = 1024
milliCPUToCPU = 1000 milliCPUToCPU = 1000
// 100000 is equivalent to 100ms // 100000 is equivalent to 100ms
@ -30,20 +27,6 @@ const (
minQuotaPeriod = 1000 minQuotaPeriod = 1000
) )
// milliCPUToShares converts milliCPU to CPU shares
func milliCPUToShares(milliCPU int64) int64 {
if milliCPU == 0 {
// Return 2 here to really match kernel default for zero milliCPU.
return minShares
}
// Conceptually (milliCPU / milliCPUToCPU) * sharesPerCPU, but factored to improve rounding.
shares := (milliCPU * sharesPerCPU) / milliCPUToCPU
if shares < minShares {
return minShares
}
return shares
}
// milliCPUToQuota converts milliCPU to CFS quota and period values // milliCPUToQuota converts milliCPU to CFS quota and period values
func milliCPUToQuota(milliCPU int64, period int64) (quota int64) { func milliCPUToQuota(milliCPU int64, period int64) (quota int64) {
// CFS quota is measured in two values: // CFS quota is measured in two values:

5
pkg/kubelet/kuberuntime/helpers_unsupported.go
View File

@ -18,8 +18,3 @@ limitations under the License.
*/ */
package kuberuntime package kuberuntime
// milliCPUToShares converts milliCPU to CPU shares
func milliCPUToShares(milliCPU int64) int64 {
return 0
}

6
pkg/kubelet/kuberuntime/kuberuntime_container_linux.go
View File

@ -139,11 +139,11 @@ func (m *kubeGenericRuntimeManager) calculateLinuxResources(cpuRequest, cpuLimit
// API server does this for new containers, but we repeat this logic in Kubelet // API server does this for new containers, but we repeat this logic in Kubelet
// for containers running on existing Kubernetes clusters. // for containers running on existing Kubernetes clusters.
if cpuRequest.IsZero() && !cpuLimit.IsZero() { if cpuRequest.IsZero() && !cpuLimit.IsZero() {
cpuShares = milliCPUToShares(cpuLimit.MilliValue()) cpuShares = int64(cm.MilliCPUToShares(cpuLimit.MilliValue()))
} else { } else {
// if cpuRequest.Amount is nil, then milliCPUToShares will return the minimal number // if cpuRequest.Amount is nil, then MilliCPUToShares will return the minimal number
// of CPU shares. // of CPU shares.
cpuShares = milliCPUToShares(cpuRequest.MilliValue()) cpuShares = int64(cm.MilliCPUToShares(cpuRequest.MilliValue()))
} }
resources.CpuShares = cpuShares resources.CpuShares = cpuShares
if memLimit != 0 { if memLimit != 0 {