Merge pull request #3014 from awmirantis/bump_20.10-cherry-pick-3003

dperny · web-flow · commit 286f4575a2d2 · 2021-09-14T08:24:28.000-06:00
[bump_20.10] Fix issue where service doesn't roll back
diff --git a/manager/orchestrator/update/updater.go b/manager/orchestrator/update/updater.go
@@ -280,6 +280,11 @@ slotsLoop:
 	wg.Wait()
 
 	if !stopped {
+		// if a delay is set we need to monitor for a period longer than the delay
+		// otherwise we will leave the monitorLoop before the task is done delaying
+		if updateConfig.Delay >= monitoringPeriod {
+			monitoringPeriod = updateConfig.Delay + 1*time.Second
+		}
 		// Keep watching for task failures for one more monitoringPeriod,
 		// before declaring the update complete.
 		doneMonitoring := time.After(monitoringPeriod)
