Guarantee durationMillis is present in getExpiringBounce response

SingularityBase/src/main/java/com/hubspot/singularity/api/SingularityBounceRequest.java

@@ -24,6 +24,15 @@ public static SingularityBounceRequest defaultRequest() {
     return new SingularityBounceRequest(Optional.<Boolean>absent(), Optional.<Boolean>absent(), Optional.<Long>absent(), Optional.of(UUID.randomUUID().toString()), Optional.<String>absent());
   }
 
+  public SingularityBounceRequestBuilder toBuilder() {
+    return new SingularityBounceRequestBuilder()
+        .setIncremental(incremental)
+        .setSkipHealthchecks(skipHealthchecks)
+        .setDurationMillis(getDurationMillis())
+        .setActionId(getActionId())
+        .setMessage(getMessage());
+  }
+
   @ApiModelProperty(required=false, value="If present and set to true, old tasks will be killed as soon as replacement tasks are available, instead of waiting for all replacement tasks to be healthy")
   public Optional<Boolean> getIncremental() {
     return incremental;

SingularityBase/src/main/java/com/hubspot/singularity/api/SingularityBounceRequestBuilder.java

@@ -0,0 +1,82 @@
+package com.hubspot.singularity.api;
+
+import com.google.common.base.Optional;
+
+public class SingularityBounceRequestBuilder {
+
+  private Optional<Boolean> incremental;
+  private Optional<Boolean> skipHealthchecks;
+
+  private Optional<Long> durationMillis;
+  private Optional<String> actionId;
+  private Optional<String> message;
+
+  public SingularityBounceRequestBuilder() {
+    this.incremental = Optional.absent();
+    this.skipHealthchecks = Optional.absent();
+
+    this.durationMillis = Optional.absent();
+    this.actionId = Optional.absent();
+    this.message = Optional.absent();
+  }
+
+  public SingularityBounceRequest build() {
+    return new SingularityBounceRequest(incremental, skipHealthchecks, durationMillis, actionId, message);
+  }
+
+  public Optional<Long> getDurationMillis() {
+    return durationMillis;
+  }
+
+  public SingularityBounceRequestBuilder setDurationMillis(Optional<Long> durationMillis) {
+    this.durationMillis = durationMillis;
+    return this;
+  }
+
+  public Optional<String> getActionId() {
+    return actionId;
+  }
+
+  public SingularityBounceRequestBuilder setActionId(Optional<String> actionId) {
+    this.actionId = actionId;
+    return this;
+  }
+
+  public Optional<String> getMessage() {
+    return message;
+  }
+
+  public SingularityBounceRequestBuilder setMessage(Optional<String> message) {
+    this.message = message;
+    return this;
+  }
+
+  public Optional<Boolean> getIncremental() {
+    return incremental;
+  }
+
+  public SingularityBounceRequestBuilder setIncremental(Optional<Boolean> incremental) {
+    this.incremental = incremental;
+    return this;
+  }
+
+  public Optional<Boolean> getSkipHealthchecks() {
+    return skipHealthchecks;
+  }
+
+  public SingularityBounceRequestBuilder setSkipHealthchecks(Optional<Boolean> skipHealthchecks) {
+    this.skipHealthchecks = skipHealthchecks;
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    return "SingularityBounceRequestBuilder{" +
+        "durationMillis='" + durationMillis + '\'' +
+        ", actionId='" + actionId + '\'' +
+        ", message=" + message + '\'' +
+        ", incremental=" + incremental + '\'' +
+        ", skipHealthchecks=" + skipHealthchecks + '\'' +
+        "}";
+  }
+}

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

@@ -53,6 +53,7 @@ public class RequestManager extends CuratorAsyncManager {
   private final Transcoder<SingularityRequestLbCleanup> requestLbCleanupTranscoder;
 
   private final SingularityEventListener singularityEventListener;
+  private final SingularityConfiguration singularityConfiguration;
 
   private static final String REQUEST_ROOT = "/requests";
 
@@ -80,14 +81,16 @@ public class RequestManager extends CuratorAsyncManager {
   public RequestManager(CuratorFramework curator, SingularityConfiguration configuration, MetricRegistry metricRegistry, SingularityEventListener singularityEventListener,
       Transcoder<SingularityRequestCleanup> requestCleanupTranscoder, Transcoder<SingularityRequestWithState> requestTranscoder, Transcoder<SingularityRequestLbCleanup> requestLbCleanupTranscoder,
       Transcoder<SingularityPendingRequest> pendingRequestTranscoder, Transcoder<SingularityRequestHistory> requestHistoryTranscoder, Transcoder<SingularityExpiringBounce> expiringBounceTranscoder,
-      Transcoder<SingularityExpiringScale> expiringScaleTranscoder,  Transcoder<SingularityExpiringPause> expiringPauseTranscoder, Transcoder<SingularityExpiringSkipHealthchecks> expiringSkipHealthchecksTranscoder) {
+      Transcoder<SingularityExpiringScale> expiringScaleTranscoder,  Transcoder<SingularityExpiringPause> expiringPauseTranscoder, Transcoder<SingularityExpiringSkipHealthchecks> expiringSkipHealthchecksTranscoder,
+      SingularityConfiguration singularityConfiguration) {
     super(curator, configuration, metricRegistry);
     this.requestTranscoder = requestTranscoder;
     this.requestCleanupTranscoder = requestCleanupTranscoder;
     this.pendingRequestTranscoder = pendingRequestTranscoder;
     this.requestHistoryTranscoder = requestHistoryTranscoder;
     this.singularityEventListener = singularityEventListener;
     this.requestLbCleanupTranscoder = requestLbCleanupTranscoder;
+    this.singularityConfiguration = singularityConfiguration;
 
     this.expiringTranscoderMap = ImmutableMap.of(
         SingularityExpiringBounce.class, expiringBounceTranscoder,

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

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.TimeZone;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 import javax.inject.Singleton;
@@ -30,7 +31,6 @@
 import com.hubspot.mesos.SingularityContainerInfo;
 import com.hubspot.mesos.SingularityContainerType;
 import com.hubspot.mesos.SingularityDockerInfo;
-import com.hubspot.mesos.SingularityDockerNetworkType;
 import com.hubspot.mesos.SingularityDockerPortMapping;
 import com.hubspot.mesos.SingularityPortMappingType;
 import com.hubspot.mesos.SingularityVolume;
@@ -39,6 +39,7 @@
 import com.hubspot.singularity.SingularityDeployBuilder;
 import com.hubspot.singularity.SingularityRequest;
 import com.hubspot.singularity.SingularityWebhook;
+import com.hubspot.singularity.api.SingularityBounceRequest;
 import com.hubspot.singularity.config.SingularityConfiguration;
 import com.hubspot.singularity.data.history.DeployHistoryHelper;
 
@@ -48,6 +49,7 @@ public class SingularityValidator {
   private static final List<Character> DEPLOY_ID_ILLEGAL_CHARACTERS = Arrays.asList('@', '-', '\\', '/', '*', '?', '%', ' ', '[', ']', '#', '$'); // Characters that make Mesos or URL bars sad
   private static final List<Character> REQUEST_ID_ILLEGAL_CHARACTERS = Arrays.asList('@', '\\', '/', '*', '?', '%', ' ', '[', ']', '#', '$'); // Characters that make Mesos or URL bars sad
 
+  private final SingularityConfiguration configuration;
   private final int maxDeployIdSize;
   private final int maxRequestIdSize;
   private final int maxCpusPerRequest;
@@ -66,6 +68,8 @@ public class SingularityValidator {
 
   @Inject
   public SingularityValidator(SingularityConfiguration configuration, DeployHistoryHelper deployHistoryHelper, RequestManager requestManager) {
+    this.configuration = configuration;
+
     this.maxDeployIdSize = configuration.getMaxDeployIdSize();
     this.maxRequestIdSize = configuration.getMaxRequestIdSize();
     this.allowRequestsWithoutOwners = configuration.isAllowRequestsWithoutOwners();
@@ -436,4 +440,15 @@ private boolean isValidInteger(String strValue) {
       return false;
     }
   }
+
+  public SingularityBounceRequest validateBounceRequest(SingularityBounceRequest defaultBounceRequest) {
+    if (defaultBounceRequest.getDurationMillis().isPresent()) {
+      return defaultBounceRequest;
+    }
+    final long durationMillis = TimeUnit.MINUTES.toMillis(configuration.getDefaultBounceExpirationMinutes());
+    return defaultBounceRequest
+        .toBuilder()
+        .setDurationMillis(Optional.of(durationMillis))
+        .build();
+  }
 }

SingularityService/src/main/java/com/hubspot/singularity/resources/RequestResource.java

@@ -201,8 +201,10 @@ public SingularityRequestParent bounce(@ApiParam("The request ID to bounce") @Pa
 
     requestManager.bounce(requestWithState.getRequest(), System.currentTimeMillis(), JavaUtils.getUserEmail(user), message);
 
+    final SingularityBounceRequest validatedBounceRequest = validator.validateBounceRequest(bounceRequest.or(SingularityBounceRequest.defaultRequest()));
+
     requestManager.saveExpiringObject(new SingularityExpiringBounce(requestId, deployId, JavaUtils.getUserEmail(user),
-        System.currentTimeMillis(), bounceRequest.or(SingularityBounceRequest.defaultRequest()), actionId.get()));
+        System.currentTimeMillis(), validatedBounceRequest, actionId.get()));
 
     return fillEntireRequest(requestWithState);
   }