Merge pull request #41527 from thaJeztah/no_oom_score_adj

daemon: don't adjust oom-score if score is 0

daemon/daemon_unix.go

@@ -1636,6 +1636,9 @@ func setMayDetachMounts() error {
 }
 
 func setupOOMScoreAdj(score int) error {
+	if score == 0 {
+		return nil
+	}
 	f, err := os.OpenFile("/proc/self/oom_score_adj", os.O_WRONLY, 0)
 	if err != nil {
 		return err

libcontainerd/supervisor/remote_daemon_linux.go

@@ -28,9 +28,6 @@ func (r *remote) setDefaults() {
 	if r.Debug.Address == "" {
 		r.Debug.Address = filepath.Join(r.stateDir, debugSockFile)
 	}
-	if r.OOMScore == 0 {
-		r.OOMScore = -999
-	}
 
 	for key, conf := range r.pluginConfs.Plugins {
 		if conf == nil {