Be sure to remove expiring bounces when a bounce completes

SingularityService/src/main/java/com/hubspot/singularity/data/RequestManager.java

@@ -225,6 +225,7 @@ public SingularityCreateResult save(SingularityRequest request, RequestState sta
 
   public SingularityCreateResult pause(SingularityRequest request, long timestamp, Optional<String> user, Optional<String> message) {
     markBounceComplete(request.getId());
+    removeExpiringBounce(request.getId());
     return save(request, RequestState.PAUSED, RequestHistoryType.PAUSED, timestamp, user, message);
   }
 
@@ -483,6 +484,10 @@ public <T extends SingularityExpiringRequestActionParent<? extends SingularityEx
     return delete(getExpiringPath(clazz, requestId));
   }
 
+  public SingularityDeleteResult removeExpiringBounce(String requestId) {
+    return deleteExpiringObject(SingularityExpiringBounce.class, requestId);
+  }
+
   public Optional<SingularityExpiringBounce> getExpiringBounce(String requestId) {
     return getExpiringObject(SingularityExpiringBounce.class, requestId);
   }

SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityCleaner.java

@@ -460,7 +460,7 @@ private void bounce(SingularityRequestCleanup requestCleanup, final List<Singula
       if (expiringBounce.isPresent() && expiringBounce.get().getDeployId().equalsIgnoreCase(requestCleanup.getDeployId().get())) {
         LOG.info("No running tasks for request {}. Marking bounce {} complete and starting new tasks", expiringBounce.get().getRequestId(), expiringBounce.get());
 
-        requestManager.deleteExpiringObject(SingularityExpiringBounce.class, requestCleanup.getRequestId());
+        requestManager.removeExpiringBounce(requestCleanup.getRequestId());
       }
       requestManager.markBounceComplete(requestCleanup.getRequestId());
     }

SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java

@@ -331,6 +331,7 @@ private void finishDeploy(SingularityRequestWithState requestWithState, Optional
       if (request.isDeployable() && !request.isOneOff()) {
         // remove the lock on bounces in case we deployed during a bounce
         requestManager.markBounceComplete(request.getId());
+        requestManager.removeExpiringBounce(request.getId());
       }
       if (requestWithState.getState() == RequestState.FINISHED) {
         // A FINISHED request is moved to ACTIVE state so we can reevaluate the schedule

SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityScheduler.java

@@ -668,7 +668,7 @@ public void handleCompletedTask(Optional<SingularityTask> task, SingularityTaskI
         Optional<SingularityExpiringBounce> expiringBounce = requestManager.getExpiringBounce(taskId.getRequestId());
 
         if (expiringBounce.isPresent() && expiringBounce.get().getDeployId().equals(taskId.getDeployId())) {
-          requestManager.deleteExpiringObject(SingularityExpiringBounce.class, taskId.getRequestId());
+          requestManager.removeExpiringBounce(taskId.getRequestId());
         }
         requestManager.markBounceComplete(taskId.getRequestId());
       }