Update ack to query param

Author: pschoenfelder

SingularityBase/src/main/java/com/hubspot/singularity/SingularityRequest.java

@@ -52,7 +52,6 @@ public class SingularityRequest {
   private final Optional<Double> taskPriorityLevel;
   private final Optional<Integer> maxTasksPerOffer;
   private final Optional<Boolean> allowBounceToSameHost;
-  private final Optional<Boolean> largeScaleDownAcknowledged;
 
   @Deprecated
   private final Optional<String> dataCenter;
@@ -127,10 +126,7 @@ public SingularityRequest(
     @JsonProperty(
       "agentAttributeMinimums"
     ) Optional<Map<String, Map<String, Integer>>> agentAttributeMinimums,
-    @JsonProperty("agentPlacement") Optional<AgentPlacement> agentPlacement,
-    @JsonProperty(
-      "largeScaleDownAcknowledged"
-    ) Optional<Boolean> largeScaleDownAcknowledged
+    @JsonProperty("agentPlacement") Optional<AgentPlacement> agentPlacement
   ) {
     this.id = checkNotNull(id, "id cannot be null");
     this.owners = owners;
@@ -183,7 +179,6 @@ public SingularityRequest(
       this.requestType = requestType;
     }
     this.dataCenter = dataCenter;
-    this.largeScaleDownAcknowledged = largeScaleDownAcknowledged;
   }
 
   public SingularityRequestBuilder toBuilder() {
@@ -579,14 +574,6 @@ public Optional<Double> getTaskPriorityLevel() {
     return taskPriorityLevel;
   }
 
-  @Schema(
-    nullable = true,
-    description = "Whether a user acknowledged that a change in scale is large"
-  )
-  public Boolean getLargeScaleDownAcknowledged() {
-    return largeScaleDownAcknowledged.orElse(false);
-  }
-
   @Deprecated
   @Schema(nullable = true, description = "the data center associated with this request")
   public Optional<String> getDataCenter() {
@@ -650,7 +637,6 @@ public boolean equals(Object o) {
       Objects.equals(taskPriorityLevel, that.taskPriorityLevel) &&
       Objects.equals(maxTasksPerOffer, that.maxTasksPerOffer) &&
       Objects.equals(allowBounceToSameHost, that.allowBounceToSameHost) &&
-      Objects.equals(largeScaleDownAcknowledged, that.largeScaleDownAcknowledged) &&
       Objects.equals(dataCenter, that.dataCenter)
     );
   }
@@ -772,8 +758,6 @@ public String toString() {
       maxTasksPerOffer +
       ", allowBounceToSameHost=" +
       allowBounceToSameHost +
-      ", largeScaleDownAcknowledged=" +
-      largeScaleDownAcknowledged +
       ", dataCenter=" +
       dataCenter +
       '}'

SingularityBase/src/main/java/com/hubspot/singularity/SingularityRequestBuilder.java

@@ -52,7 +52,6 @@ public class SingularityRequestBuilder {
   private Optional<Double> taskPriorityLevel;
   private Optional<Integer> maxTasksPerOffer;
   private Optional<Boolean> allowBounceToSameHost;
-  private Optional<Boolean> largeScaleDownAcknowledged;
 
   @Deprecated
   private Optional<String> dataCenter;
@@ -94,7 +93,6 @@ public SingularityRequestBuilder(String id, RequestType requestType) {
     this.allowBounceToSameHost = Optional.empty();
     this.requiredRole = Optional.empty();
     this.dataCenter = Optional.empty();
-    this.largeScaleDownAcknowledged = Optional.of(false);
   }
 
   public SingularityRequest build() {
@@ -139,8 +137,7 @@ public SingularityRequest build() {
       requiredAgentAttributes,
       allowedAgentAttributes,
       agentAttributeMinimums,
-      agentPlacement,
-      largeScaleDownAcknowledged
+      agentPlacement
     );
   }
 
@@ -525,17 +522,6 @@ public SingularityRequestBuilder setAllowBounceToSameHost(
     return this;
   }
 
-  public Optional<Boolean> getLargeScaleDownAcknowledged() {
-    return largeScaleDownAcknowledged;
-  }
-
-  public SingularityRequestBuilder setLargeScaleDownAcknowledged(
-    Optional<Boolean> largeScaleDownAcknowledged
-  ) {
-    this.largeScaleDownAcknowledged = largeScaleDownAcknowledged;
-    return this;
-  }
-
   @Deprecated
   public Optional<String> getDataCenter() {
     return dataCenter;
@@ -604,7 +590,6 @@ public boolean equals(Object o) {
       Objects.equals(taskPriorityLevel, that.taskPriorityLevel) &&
       Objects.equals(maxTasksPerOffer, that.maxTasksPerOffer) &&
       Objects.equals(allowBounceToSameHost, that.allowBounceToSameHost) &&
-      Objects.equals(largeScaleDownAcknowledged, that.largeScaleDownAcknowledged) &&
       Objects.equals(dataCenter, that.dataCenter)
     );
   }
@@ -647,7 +632,6 @@ public int hashCode() {
       taskPriorityLevel,
       maxTasksPerOffer,
       allowBounceToSameHost,
-      largeScaleDownAcknowledged,
       dataCenter
     );
   }
@@ -727,8 +711,6 @@ public String toString() {
       maxTasksPerOffer +
       ", allowBounceToSameHost=" +
       allowBounceToSameHost +
-      ", largeScaleDownAcknowledged=" +
-      largeScaleDownAcknowledged +
       ", dataCenter=" +
       dataCenter +
       '}'

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

@@ -1209,7 +1209,11 @@ private boolean isAllowBounceToSameHost(SingularityRequest request) {
     }
   }
 
-  public void checkScale(SingularityRequest request, Optional<Integer> previousScale) {
+  public void checkScale(
+    SingularityRequest request,
+    Optional<Integer> previousScale,
+    Boolean largeScaleDownAcknowledged
+  ) {
     AgentPlacement placement = request.getAgentPlacement().orElse(defaultAgentPlacement);
 
     if (placement != AgentPlacement.GREEDY && placement != AgentPlacement.OPTIMISTIC) {
@@ -1240,7 +1244,7 @@ public void checkScale(SingularityRequest request, Optional<Integer> previousSca
       }
     }
 
-    if (previousScale.isPresent() && !request.getLargeScaleDownAcknowledged()) {
+    if (previousScale.isPresent() && !largeScaleDownAcknowledged) {
       int absMaxScaleDown = singularityConfiguration.getMaxScaleDownWithoutAcknowledgement();
       boolean scaleDownExceedsAbsoluteMax =
         previousScale.get() - request.getInstancesSafe() > absMaxScaleDown;

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

@@ -56,6 +56,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import org.apache.curator.framework.recipes.leader.LeaderLatch;
@@ -131,19 +132,21 @@ public SingularityRequestParent deploy(
     @RequestBody(
       required = true,
       description = "Deploy data"
-    ) SingularityDeployRequest deployRequest
+    ) SingularityDeployRequest deployRequest,
+    @QueryParam("largeScaleDownAcknowledged") Boolean largeScaleDownAcknowledged
   ) {
     return maybeProxyToLeader(
       requestContext,
       SingularityRequestParent.class,
       deployRequest,
-      () -> deploy(deployRequest, user)
+      () -> deploy(deployRequest, user, largeScaleDownAcknowledged)
     );
   }
 
   public SingularityRequestParent deploy(
     SingularityDeployRequest deployRequest,
-    SingularityUser user
+    SingularityUser user,
+    Boolean largeScaleDownAcknowledged
   ) {
     validator.checkActionEnabled(SingularityAction.DEPLOY);
     SingularityDeploy deploy = deployRequest.getDeploy();
@@ -197,7 +200,8 @@ public SingularityRequestParent deploy(
 
     validator.checkScale(
       request,
-      Optional.of(taskManager.getActiveTaskIdsForRequest(request.getId()).size())
+      Optional.of(taskManager.getActiveTaskIdsForRequest(request.getId()).size()),
+      largeScaleDownAcknowledged
     );
 
     if (

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

@@ -228,7 +228,7 @@ private void submitRequest(
       !oldRequest.isPresent() ||
       !(oldRequest.get().getInstancesSafe() == request.getInstancesSafe())
     ) {
-      validator.checkScale(request, Optional.empty());
+      validator.checkScale(request, Optional.empty(), false);
     }
 
     authorizationHelper.checkForAuthorization(
@@ -1808,7 +1808,7 @@ public SingularityRequestParent scale(
       .toBuilder()
       .setInstances(scaleRequest.getInstances())
       .build();
-    validator.checkScale(newRequest, Optional.<Integer>empty());
+    validator.checkScale(newRequest, Optional.<Integer>empty(), false);
 
     checkBadRequest(
       oldRequest.getInstancesSafe() != newRequest.getInstancesSafe(),