Improve retry logic

zeroturnaround · Sep 9, 2016 · 7307fe9 · 7307fe9
1 parent c2cee0c
commit 7307fe9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/com/zeroturnaround/jenkins/plugin/ecs/deploy/steps/UpdateServiceStep.java b/src/main/java/com/zeroturnaround/jenkins/plugin/ecs/deploy/steps/UpdateServiceStep.java
@@ -96,7 +96,13 @@ public void perform(AmazonECS ecs, AbstractBuild<?, ?> build, Launcher launcher,
                         deployment.getCreatedAt()
                 );
 
-                shouldRetry = shouldRetry || !"PRIMARY".equalsIgnoreCase(deployment.getStatus());
+                if ("PRIMARY".equalsIgnoreCase(deployment.getStatus())) {
+                    // Retry if it's PRIMARY and desired !== running
+                    shouldRetry = shouldRetry || deployment.getDesiredCount().equals(deployment.getRunningCount());
+                } else {
+                    // Retry if we found a non-primary task
+                    shouldRetry = true;
+                }
             }
             logger.println(TABLE_LINE);
             logger.println();