Merge pull request #5321 from thaJeztah/fix_oom_score_test

crosbymichael · web-flow · commit ceb08756a43d · 2021-04-08T14:54:50.000-04:00
fix TestSetOOMScoreBoundaries and replace missing busybox image in CI
diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go
@@ -32,7 +32,7 @@ const (
 )
 
 var (
-	testImage    = "mirror.gcr.io/library/busybox:latest"
+	testImage    = "mirror.gcr.io/library/busybox:1.32.0"
 	shortCommand = withProcessArgs("true")
 	longCommand  = withProcessArgs("/bin/sh", "-c", "while true; do sleep 1; done")
 )
diff --git a/sys/oom_linux.go b/sys/oom_linux.go
@@ -65,7 +65,8 @@ func SetOOMScore(pid, score int) error {
 	return nil
 }
 
-// GetOOMScoreAdj gets the oom score for a process
+// GetOOMScoreAdj gets the oom score for a process. It returns 0 (zero) if either
+// no oom score is set, or a sore is set to 0.
 func GetOOMScoreAdj(pid int) (int, error) {
 	path := fmt.Sprintf("/proc/%d/oom_score_adj", pid)
 	data, err := ioutil.ReadFile(path)
diff --git a/sys/oom_linux_test.go b/sys/oom_linux_test.go
@@ -71,9 +71,11 @@ func TestSetOOMScoreBoundaries(t *testing.T) {
 
 	score, err := GetOOMScoreAdj(os.Getpid())
 	assert.NilError(t, err)
-	if score == 0 || score == OOMScoreAdjMin {
-		// we won't be able to set the score lower than the parent process,
-		// so only test if parent process does not have a oom-score-adj
+	if score == OOMScoreAdjMin {
+		// We won't be able to set the score lower than the parent process. This
+		// could also be tested if the parent process does not have a oom-score-adj
+		// set, but GetOOMScoreAdj does not distinguish between "not set" and
+		// "score is set, but zero".
 		_, adjustment, err = adjustOom(OOMScoreAdjMin)
 		assert.NilError(t, err)
 		assert.Check(t, is.Equal(adjustment, OOMScoreAdjMin))

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ const (`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`var (`
`35`		`- testImage = "mirror.gcr.io/library/busybox:latest"`
	`35`	`+ testImage = "mirror.gcr.io/library/busybox:1.32.0"`
`36`	`36`	`shortCommand = withProcessArgs("true")`
`37`	`37`	`longCommand = withProcessArgs("/bin/sh", "-c", "while true; do sleep 1; done")`
`38`	`38`	`)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ func SetOOMScore(pid, score int) error {`
`65`	`65`	`return nil`
`66`	`66`	`}`
`67`	`67`
`68`		`-// GetOOMScoreAdj gets the oom score for a process`
	`68`	`+// GetOOMScoreAdj gets the oom score for a process. It returns 0 (zero) if either`
	`69`	`+// no oom score is set, or a sore is set to 0.`
`69`	`70`	`func GetOOMScoreAdj(pid int) (int, error) {`
`70`	`71`	`path := fmt.Sprintf("/proc/%d/oom_score_adj", pid)`
`71`	`72`	`data, err := ioutil.ReadFile(path)`