Merge pull request #37808 from hex108/add_retry_interval

Automatic merge from submit-queue (batch tested with PRs 37094, 37663, 37442, 37808, 37826) Add some sleep between each retry to set container's oom scroe Ref https://github.com/kubernetes/kubernetes/issues/23607#issuecomment-264135015

Merge pull request #37808 from hex108/add_retry_interval
b926fa50 · Kubernetes Submit Queue · GitHub · caa935df · 3e856756 · b926fa50
Commit b926fa50 authored Dec 03, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

oom_linux.go pkg/util/oom/oom_linux.go +2 -0

No files found.
--- a/pkg/util/oom/oom_linux.go
+++ b/pkg/util/oom/oom_linux.go
@@ -25,6 +25,7 @@ import (
 	"path"
 	"path/filepath"
 	"strconv"
+	"time"

 	cmutil "k8s.io/kubernetes/pkg/kubelet/cm/util"

@@ -72,6 +73,7 @@ func applyOOMScoreAdj(pid int, oomScoreAdj int) error {
 			}

 			glog.V(3).Info(err)
+			time.Sleep(100 * time.Millisecond)
 			continue
 		}
 		return nil