daemon/drain.go: bump initial drain sleeps down to 1min

Manual backport of openshift#2611
kikisdeliveryservice · Jun 13, 2021 · a5ed55c · a5ed55c
1 parent e980e4e
commit a5ed55c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/daemon/update.go b/pkg/daemon/update.go
@@ -191,6 +191,7 @@ func (dn *Daemon) drain() error {
 	}
 
 	dn.logSystem("Update prepared; beginning drain")
+	failedDrains := 0
 	startTime := time.Now()
 
 	dn.recorder.Eventf(getNodeRef(dn.node), corev1.EventTypeNormal, "Drain", "Draining node to update config.")
@@ -207,7 +208,12 @@ func (dn *Daemon) drain() error {
 				default:
 					if err := drain.RunNodeDrain(dn.drainer, dn.node.Name); err != nil {
 						glog.Infof("Draining failed with: %v, retrying", err)
-						time.Sleep(5 * time.Minute)
+						failedDrains++
+						if failedDrains > 5 {
+							time.Sleep(5 * time.Minute)
+						} else {
+							time.Sleep(1 * time.Minute)
+						}
 						continue
 					}
 					close(ret)