diff --git a/vendor.conf b/vendor.conf index 394bc8807c..846b3ef2a4 100644 --- a/vendor.conf +++ b/vendor.conf @@ -142,7 +142,7 @@ github.com/gogo/googleapis 01e0f9cca9b92166042241267ee2 github.com/cilium/ebpf 1c8d4c9ef7759622653a1d319284a44652333b28 # cluster -github.com/docker/swarmkit c9afb5fd44bb419bae719f400f31671712bcb99e # bump_20.10 +github.com/docker/swarmkit 286f4575a2d2853c1574e1be10eb1a2450692dfc # bump_20.10 github.com/gogo/protobuf 5628607bb4c51c3157aacc3a50f0ab707582b805 # v1.3.1 github.com/golang/protobuf 84668698ea25b64748563aa20726db66a6b8d299 # v1.3.5 github.com/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2 diff --git a/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go b/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go index 4e6a2cc0bd..e181a4ffa2 100644 --- a/vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go +++ b/vendor/github.com/docker/swarmkit/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)