0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #42236 from thaJeztah/20.10_backport_specconv_fix_trimspace

Browse source 
[20.10 backport] rootless: fix getCurrentOOMScoreAdj
This commit is contained in:
Tibor Vass 2021-04-01 05:31:04 -07:00 committed by GitHub
commit d6ca8a8e16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rootless/specconv/specconv_linux.go
View file

@ -3,8 +3,10 @@ package specconv // import "github.com/docker/docker/rootless/specconv"
import (
"io/ioutil"
"strconv"
"strings"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
)
// ToRootless converts spec to be compatible with "rootless" runc.
@ -19,10 +21,13 @@ func ToRootless(spec *specs.Spec, v2Controllers []string) error {
func getCurrentOOMScoreAdj() int {
b, err := ioutil.ReadFile("/proc/self/oom_score_adj")
if err != nil {
logrus.WithError(err).Warn("failed to read /proc/self/oom_score_adj")
return 0
}
i, err := strconv.Atoi(string(b))
s := string(b)
i, err := strconv.Atoi(strings.TrimSpace(s))
if err != nil {
logrus.WithError(err).Warnf("failed to parse /proc/self/oom_score_adj (%q)", s)
return 0
}
return i