Signed-off-by: Adam Williams <awilliams@mirantis.com>
| ... | ... |
@@ -142,7 +142,7 @@ github.com/gogo/googleapis 01e0f9cca9b92166042241267ee2 |
| 142 | 142 |
github.com/cilium/ebpf 1c8d4c9ef7759622653a1d319284a44652333b28 |
| 143 | 143 |
|
| 144 | 144 |
# cluster |
| 145 |
-github.com/docker/swarmkit c9afb5fd44bb419bae719f400f31671712bcb99e # bump_20.10 |
|
| 145 |
+github.com/docker/swarmkit 286f4575a2d2853c1574e1be10eb1a2450692dfc # bump_20.10 |
|
| 146 | 146 |
github.com/gogo/protobuf 5628607bb4c51c3157aacc3a50f0ab707582b805 # v1.3.1 |
| 147 | 147 |
github.com/golang/protobuf 84668698ea25b64748563aa20726db66a6b8d299 # v1.3.5 |
| 148 | 148 |
github.com/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2 |
| ... | ... |
@@ -280,6 +280,11 @@ slotsLoop: |
| 280 | 280 |
wg.Wait() |
| 281 | 281 |
|
| 282 | 282 |
if !stopped {
|
| 283 |
+ // if a delay is set we need to monitor for a period longer than the delay |
|
| 284 |
+ // otherwise we will leave the monitorLoop before the task is done delaying |
|
| 285 |
+ if updateConfig.Delay >= monitoringPeriod {
|
|
| 286 |
+ monitoringPeriod = updateConfig.Delay + 1*time.Second |
|
| 287 |
+ } |
|
| 283 | 288 |
// Keep watching for task failures for one more monitoringPeriod, |
| 284 | 289 |
// before declaring the update complete. |
| 285 | 290 |
doneMonitoring := time.After(monitoringPeriod) |