prevent pending request deletion of new scheduled task deploy on star…

…tup with outdated running task
HubSpot · Nov 5, 2021 · 22e0dea · 22e0dea
1 parent a3a50e9
commit 22e0dea
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityScheduler.java b/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityScheduler.java
@@ -491,12 +491,25 @@ private void handlePendingRequestsForDeployKey(
         pendingRequest,
         maybePendingDeploy
       );
-      if (
-        missingInstances == 0 &&
-        !matchingTaskIds.isEmpty() &&
-        updatedRequest.isScheduled() &&
-        pendingRequest.getPendingType() == PendingType.NEW_DEPLOY
-      ) {
+      boolean scheduledRequestWithActiveTask =
+        (
+          missingInstances == 0 &&
+          !matchingTaskIds.isEmpty() &&
+          updatedRequest.isScheduled() &&
+          pendingRequest.getPendingType() == PendingType.NEW_DEPLOY
+        );
+      boolean scheduledRequestWithOutdatedActiveTask =
+        (
+          missingInstances == 0 &&
+          matchingTaskIds.isEmpty() &&
+          updatedRequest.isScheduled() &&
+          (
+            pendingRequest.getPendingType() == PendingType.NEW_DEPLOY ||
+            pendingRequest.getPendingType() == PendingType.STARTUP
+          )
+        );
+
+      if (scheduledRequestWithActiveTask || scheduledRequestWithOutdatedActiveTask) {
         LOG.trace(
           "Holding pending request {} because it is scheduled and has an active task",
           pendingRequest