github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13867 from JanetKuo/qos-policy-bug

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-11 19:13:18 -07:00
parent 214f740f03 452ebed92b
commit 960b9e9564
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/qos/memory_policy.go
View File

@@ -37,9 +37,9 @@ func isMemoryBestEffort(container *api.Container) bool {
func isMemoryGuaranteed(container *api.Container) bool { func isMemoryGuaranteed(container *api.Container) bool {
// A container is memory guaranteed if its memory request == memory limit. // A container is memory guaranteed if its memory request == memory limit.
// If memory request == memory limit, the user is very confident of resource consumption. // If memory request == memory limit, the user is very confident of resource consumption.
memoryRequestValue := container.Resources.Requests.Memory().Value() memoryRequest := container.Resources.Requests.Memory()
memoryLimitValue := container.Resources.Limits.Memory().Value() memoryLimit := container.Resources.Limits.Memory()
return memoryRequestValue == memoryLimitValue && memoryRequestValue != 0 return (*memoryRequest).Cmp(*memoryLimit) == 0 && memoryRequest.Value() != 0
} }
// GetContainerOomAdjust returns the amount by which the OOM score of all processes in the // GetContainerOomAdjust returns the amount by which the OOM score of all processes in the