d22dde8eb1
`getCurrentOOMScoreAdj()` was broken because `strconv.Atoi()` was called
without trimming "\n".
Fix issue 40068: `rootless docker in kubernetes: "getting the final child's pid from
pipe caused \"EOF\": unknown"
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit d6ddfb6118)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
79 lines
2.1 KiB
Go
79 lines
2.1 KiB
Go
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.
|
|
// * Remove non-supported cgroups
|
|
// * Fix up OOMScoreAdj
|
|
//
|
|
// v2Controllers should be non-nil only if running with v2 and systemd.
|
|
func ToRootless(spec *specs.Spec, v2Controllers []string) error {
|
|
return toRootless(spec, v2Controllers, getCurrentOOMScoreAdj())
|
|
}
|
|
|
|
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
|
|
}
|
|
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
|
|
}
|
|
|
|
func toRootless(spec *specs.Spec, v2Controllers []string, currentOOMScoreAdj int) error {
|
|
if len(v2Controllers) == 0 {
|
|
// Remove cgroup settings.
|
|
spec.Linux.Resources = nil
|
|
spec.Linux.CgroupsPath = ""
|
|
} else {
|
|
if spec.Linux.Resources != nil {
|
|
m := make(map[string]struct{})
|
|
for _, s := range v2Controllers {
|
|
m[s] = struct{}{}
|
|
}
|
|
// Remove devices: https://github.com/containers/crun/issues/255
|
|
spec.Linux.Resources.Devices = nil
|
|
if _, ok := m["memory"]; !ok {
|
|
spec.Linux.Resources.Memory = nil
|
|
}
|
|
if _, ok := m["cpu"]; !ok {
|
|
spec.Linux.Resources.CPU = nil
|
|
}
|
|
if _, ok := m["cpuset"]; !ok {
|
|
if spec.Linux.Resources.CPU != nil {
|
|
spec.Linux.Resources.CPU.Cpus = ""
|
|
spec.Linux.Resources.CPU.Mems = ""
|
|
}
|
|
}
|
|
if _, ok := m["pids"]; !ok {
|
|
spec.Linux.Resources.Pids = nil
|
|
}
|
|
if _, ok := m["io"]; !ok {
|
|
spec.Linux.Resources.BlockIO = nil
|
|
}
|
|
if _, ok := m["rdma"]; !ok {
|
|
spec.Linux.Resources.Rdma = nil
|
|
}
|
|
spec.Linux.Resources.HugepageLimits = nil
|
|
spec.Linux.Resources.Network = nil
|
|
}
|
|
}
|
|
|
|
if spec.Process.OOMScoreAdj != nil && *spec.Process.OOMScoreAdj < currentOOMScoreAdj {
|
|
*spec.Process.OOMScoreAdj = currentOOMScoreAdj
|
|
}
|
|
return nil
|
|
}
|