Merge pull request #39455 from kubernetes/revert-39306-oom_score_adj

Automatic merge from submit-queue (batch tested with PRs 39486, 37288, 39477, 39455, 39542) Revert "Small improve for GetContainerOOMScoreAdjust" Reverts kubernetes/kubernetes#39306 This does not help current code healthy, let's revert it to avoid further confusing.

Merge pull request #39455 from kubernetes/revert-39306-oom_score_adj
65d6a5c6 · Kubernetes Submit Queue · GitHub · c03ec462 · 9712fe84 · 65d6a5c6
Commit 65d6a5c6 authored Jan 10, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

policy.go pkg/kubelet/qos/policy.go +2 -2

No files found.
--- a/pkg/kubelet/qos/policy.go
+++ b/pkg/kubelet/qos/policy.go
@@ -72,8 +72,8 @@ func GetContainerOOMScoreAdjust(pod *v1.Pod, container *v1.Container, memoryCapa
 		return (1000 + guaranteedOOMScoreAdj)
 	}
 	// Give burstable pods a higher chance of survival over besteffort pods.
-	if int(oomScoreAdjust) >= besteffortOOMScoreAdj {
-		return int(besteffortOOMScoreAdj - 1)
+	if int(oomScoreAdjust) == besteffortOOMScoreAdj {
+		return int(oomScoreAdjust - 1)
 	}
 	return int(oomScoreAdjust)
 }