github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix TestSetOOMScoreBoundaries

Browse Source 
(this was introduced in 44240116aa)

Setting the oom-score-adj to -1000 is only possible if the parent process
either has no score set, or if the score is set to -1000.

However, the current implementation of GetOOMScoreAdj conflates situations
where either _no_ oom-score is set, _or_ oom-score is set, but set to 0.

In the latter case, the test would fail:

    --- FAIL: TestSetOOMScoreBoundaries (0.01s)
        oom_linux_test.go:79: assertion failed: 0 (adjustment int) != -1000 (OOMScoreAdjMin int)
    FAIL

To prevent failures in this situation, skip that part of the test in the
above situation.

Also update the description of GetOOMScoreAdj to clarify its behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-04-08 12:04:23 +02:00
parent 21ebeef745
commit 3d20fa9309
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/oom_linux.go
View File

@ -65,7 +65,8 @@ func SetOOMScore(pid, score int) error {
return nil 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) { func GetOOMScoreAdj(pid int) (int, error) {
path := fmt.Sprintf("/proc/%d/oom_score_adj", pid) path := fmt.Sprintf("/proc/%d/oom_score_adj", pid)
data, err := ioutil.ReadFile(path) data, err := ioutil.ReadFile(path)

8
sys/oom_linux_test.go
View File

@ -71,9 +71,11 @@ func TestSetOOMScoreBoundaries(t *testing.T) {
score, err := GetOOMScoreAdj(os.Getpid()) score, err := GetOOMScoreAdj(os.Getpid())
assert.NilError(t, err) assert.NilError(t, err)
if score == 0 || score == OOMScoreAdjMin { if score == OOMScoreAdjMin {
// we won't be able to set the score lower than the parent process, // We won't be able to set the score lower than the parent process. This
// so only test if parent process does not have a oom-score-adj // 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) _, adjustment, err = adjustOom(OOMScoreAdjMin)
assert.NilError(t, err) assert.NilError(t, err)
assert.Check(t, is.Equal(adjustment, OOMScoreAdjMin)) assert.Check(t, is.Equal(adjustment, OOMScoreAdjMin))