Merge pull request kubernetes#71269 from DeliangFan/adjust_oom_score_adj

k8s-ci-robot · web-flow · commit 48329e7d9181 · 2020-09-21T19:40:47.000-07:00
Set the oom_score_adj of guaranteed pod to -997
diff --git a/pkg/kubelet/qos/policy.go b/pkg/kubelet/qos/policy.go
@@ -27,7 +27,7 @@ const (
 	KubeletOOMScoreAdj int = -999
 	// KubeProxyOOMScoreAdj is the OOM score adjustment for kube-proxy
 	KubeProxyOOMScoreAdj  int = -999
-	guaranteedOOMScoreAdj int = -998
+	guaranteedOOMScoreAdj int = -997
 	besteffortOOMScoreAdj int = 1000
 )
 
diff --git a/pkg/kubelet/qos/policy_test.go b/pkg/kubelet/qos/policy_test.go
@@ -187,8 +187,8 @@ func TestGetContainerOOMScoreAdjust(t *testing.T) {
 		{
 			pod:             &equalRequestLimitCPUMemory,
 			memoryCapacity:  123456789,
-			lowOOMScoreAdj:  -998,
-			highOOMScoreAdj: -998,
+			lowOOMScoreAdj:  -997,
+			highOOMScoreAdj: -997,
 		},
 		{
 			pod:             &cpuUnlimitedMemoryLimitedWithRequests,
@@ -199,14 +199,14 @@ func TestGetContainerOOMScoreAdjust(t *testing.T) {
 		{
 			pod:             &requestNoLimit,
 			memoryCapacity:  standardMemoryAmount,
-			lowOOMScoreAdj:  2,
-			highOOMScoreAdj: 2,
+			lowOOMScoreAdj:  3,
+			highOOMScoreAdj: 3,
 		},
 		{
 			pod:             &critical,
 			memoryCapacity:  4000000000,
-			lowOOMScoreAdj:  -998,
-			highOOMScoreAdj: -998,
+			lowOOMScoreAdj:  -997,
+			highOOMScoreAdj: -997,
 		},
 	}
 	for _, test := range oomTests {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const (`
`27`	`27`	`KubeletOOMScoreAdj int = -999`
`28`	`28`	`// KubeProxyOOMScoreAdj is the OOM score adjustment for kube-proxy`
`29`	`29`	`KubeProxyOOMScoreAdj int = -999`
`30`		`- guaranteedOOMScoreAdj int = -998`
	`30`	`+ guaranteedOOMScoreAdj int = -997`
`31`	`31`	`besteffortOOMScoreAdj int = 1000`
`32`	`32`	`)`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,8 @@ func TestGetContainerOOMScoreAdjust(t *testing.T) {`
`187`	`187`	`{`
`188`	`188`	`pod: &equalRequestLimitCPUMemory,`
`189`	`189`	`memoryCapacity: 123456789,`
`190`		`- lowOOMScoreAdj: -998,`
`191`		`- highOOMScoreAdj: -998,`
	`190`	`+ lowOOMScoreAdj: -997,`
	`191`	`+ highOOMScoreAdj: -997,`
`192`	`192`	`},`
`193`	`193`	`{`
`194`	`194`	`pod: &cpuUnlimitedMemoryLimitedWithRequests,`
`@@ -199,14 +199,14 @@ func TestGetContainerOOMScoreAdjust(t *testing.T) {`
`199`	`199`	`{`
`200`	`200`	`pod: &requestNoLimit,`
`201`	`201`	`memoryCapacity: standardMemoryAmount,`
`202`		`- lowOOMScoreAdj: 2,`
`203`		`- highOOMScoreAdj: 2,`
	`202`	`+ lowOOMScoreAdj: 3,`
	`203`	`+ highOOMScoreAdj: 3,`
`204`	`204`	`},`
`205`	`205`	`{`
`206`	`206`	`pod: &critical,`
`207`	`207`	`memoryCapacity: 4000000000,`
`208`		`- lowOOMScoreAdj: -998,`
`209`		`- highOOMScoreAdj: -998,`
	`208`	`+ lowOOMScoreAdj: -997,`
	`209`	`+ highOOMScoreAdj: -997,`
`210`	`210`	`},`
`211`	`211`	`}`
`212`	`212`	`for _, test := range oomTests {`