github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74856 from draveness/fix/daemonset-controller-slow-batch-creation

Browse Source 
fix(daemon): create more expections when skipping pods
This commit is contained in:
Kubernetes Prow Robot
2019-05-03 23:33:37 -07:00
committed by GitHub
parent 22cf3ca0a5 5f8dfdc698
commit d5245b9563
2 changed files with 97 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/daemon/daemon_controller.go
View File

@@ -1067,7 +1067,7 @@ func (dsc *DaemonSetsController) syncNodes(ds *apps.DaemonSet, podsToDelete, nod
}
createWait.Wait()
// any skipped pods that we never attempted to start shouldn't be expected.
skippedPods := createDiff - batchSize
skippedPods := createDiff - (batchSize + pos)
if errorCount < len(errCh) && skippedPods > 0 {
klog.V(2).Infof("Slow-start failure. Skipping creation of %d pods, decrementing expectations for set %q/%q", skippedPods, ds.Namespace, ds.Name)
for i := 0; i < skippedPods; i++ {