Merge pull request #2126 from HubSpot/reconcile_fix

Use leader cache first for launching check, also check staging
HubSpot · Aug 25, 2020 · efeddbb · efeddbb
2 parents e04f483 + f2261f6
commit efeddbb
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/data/TaskManager.java b/SingularityService/src/main/java/com/hubspot/singularity/data/TaskManager.java
@@ -893,7 +893,26 @@ public int getNumLaunchingTasks() {
   public List<SingularityTaskId> getLaunchingTasks() {
     return getActiveTaskIds()
       .stream()
-      .filter(t -> exists(getUpdatePath(t, ExtendedTaskState.TASK_STARTING)))
+      .filter(
+        t -> {
+          if (leaderCache.active()) {
+            List<SingularityTaskHistoryUpdate> historyUpdates = leaderCache.getTaskHistoryUpdates(
+              t
+            );
+            return (
+              historyUpdates.isEmpty() ||
+              historyUpdates.get(historyUpdates.size() - 1).getTaskState() ==
+              ExtendedTaskState.TASK_LAUNCHED
+            );
+          } else {
+            return (
+              !exists(getUpdatePath(t, ExtendedTaskState.TASK_STARTING)) &&
+              !exists(getUpdatePath(t, ExtendedTaskState.TASK_STAGING)) &&
+              !exists(getUpdatePath(t, ExtendedTaskState.TASK_RUNNING))
+            );
+          }
+        }
+      )
       .collect(Collectors.toList());
   }