Svc upgrade: wait for last batch to become healthy

Before marking service as successfully upgraded
rancher · Mar 13, 2018 · 370f21f · 370f21f
1 parent 9be7a52
commit 370f21f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...er/src/main/java/io/cattle/platform/servicediscovery/upgrade/impl/UpgradeManagerImpl.java b/...er/src/main/java/io/cattle/platform/servicediscovery/upgrade/impl/UpgradeManagerImpl.java
@@ -140,8 +140,11 @@ protected void upgradeDeploymentUnits(final Service service,
         lockManager.lock(new ServiceLock(service), new LockCallbackNoReturn() {
             @Override
             public void doWithLockNoResult() {
-                // wait for healthy only for upgrade
-                // should be skipped for rollback
+                // wait for healthy only for upgrade; should be skipped for rollback
+                // wait for healthy happens 3 times in this block:
+                // 1. Before performing an upgrade on the batch
+                // 2. If startFirst=true, after the upgrade is done, but before stop
+                // 3. After the batch upgrade is completed
                 if (isUpgrade) {
                     deploymentMgr.activate(service);
                     waitForHealthyState(service, currentProcess, strategy);
@@ -167,6 +170,9 @@ public void doWithLockNoResult() {
                     // 2. wait for reconcile (new instances will be started along)
                     activate(service);
                 }
+                if (isUpgrade) {
+                    waitForHealthyState(service, currentProcess, strategy);
+                }
             }
 
             protected void markForUpgrade(final long batchSize) {