github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37808 from hex108/add_retry_interval

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-12-03 04:27:52 -08:00 committed by GitHub
commit b926fa5009
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/oom/oom_linux.go
View File

@ -25,6 +25,7 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"strconv" "strconv"
"time"
cmutil "k8s.io/kubernetes/pkg/kubelet/cm/util" cmutil "k8s.io/kubernetes/pkg/kubelet/cm/util"
@ -72,6 +73,7 @@ func applyOOMScoreAdj(pid int, oomScoreAdj int) error {
} }
glog.V(3).Info(err) glog.V(3).Info(err)
time.Sleep(100 * time.Millisecond)
continue continue
} }
return nil return nil