Update validation

Author: pschoenfelder

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

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

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

@@ -133,7 +133,7 @@ public SingularityRequestParent deploy(
       required = true,
       description = "Deploy data"
     ) SingularityDeployRequest deployRequest,
-    @QueryParam("largeScaleDownAcknowledged") Boolean largeScaleDownAcknowledged
+    @QueryParam("largeScaleDownAcknowledged") Optional<Boolean> largeScaleDownAcknowledged
   ) {
     return maybeProxyToLeader(
       requestContext,
@@ -146,7 +146,7 @@ public SingularityRequestParent deploy(
   public SingularityRequestParent deploy(
     SingularityDeployRequest deployRequest,
     SingularityUser user,
-    Boolean largeScaleDownAcknowledged
+    Optional<Boolean> largeScaleDownAcknowledged
   ) {
     validator.checkActionEnabled(SingularityAction.DEPLOY);
     SingularityDeploy deploy = deployRequest.getDeploy();

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

@@ -168,7 +168,8 @@ private void submitRequest(
     Optional<Boolean> skipHealthchecks,
     Optional<String> message,
     Optional<SingularityBounceRequest> maybeBounceRequest,
-    SingularityUser user
+    SingularityUser user,
+    Optional<Boolean> largeScaleDownAcknowledged
   ) {
     checkNotNullBadRequest(request.getId(), "Request must have an id");
     checkConflict(
@@ -224,11 +225,14 @@ private void submitRequest(
         request.toBuilder().setInstances(Optional.of(currentActiveAgentCount)).build();
     }
 
-    if (
-      !oldRequest.isPresent() ||
-      !(oldRequest.get().getInstancesSafe() == request.getInstancesSafe())
-    ) {
-      validator.checkScale(request, Optional.empty(), false);
+    if (!oldRequest.isPresent()) {
+      validator.checkScale(request, Optional.empty(), largeScaleDownAcknowledged);
+    } else if (!(oldRequest.get().getInstancesSafe() == request.getInstancesSafe())) {
+      validator.checkScale(
+        request,
+        Optional.of(oldRequest.get().getInstancesSafe()),
+        largeScaleDownAcknowledged
+      );
     }
 
     authorizationHelper.checkForAuthorization(
@@ -383,7 +387,8 @@ public SingularityRequestParent postRequest(
       Optional.empty(),
       Optional.empty(),
       Optional.empty(),
-      user
+      user,
+      Optional.empty()
     );
     return fillEntireRequest(fetchRequestWithState(request.getId(), user));
   }
@@ -463,7 +468,8 @@ private SingularityRequestParent updateAuthorizedGroups(
       Optional.empty(),
       updateGroupsRequest.getMessage(),
       Optional.empty(),
-      user
+      user,
+      Optional.empty()
     );
     return fillEntireRequest(fetchRequestWithState(requestId, user));
   }
@@ -1735,7 +1741,8 @@ public SingularityRequestParent setPriority(
       Optional.of(false),
       Optional.of(message),
       Optional.empty(),
-      user
+      user,
+      Optional.empty()
     );
 
     if (priorityRequest.getDurationMillis().isPresent()) {
@@ -1775,20 +1782,30 @@ public SingularityRequestParent scale(
     @RequestBody(
       required = true,
       description = "Object to hold number of instances to request"
-    ) SingularityScaleRequest scaleRequest
+    ) SingularityScaleRequest scaleRequest,
+    @QueryParam("largeScaleDownAcknowledged") Optional<Boolean> largeScaleDownAcknowledged
   ) {
     return maybeProxyToLeader(
       requestContext,
       SingularityRequestParent.class,
       scaleRequest,
-      () -> scale(requestId, scaleRequest, user)
+      () -> scale(requestId, scaleRequest, user, largeScaleDownAcknowledged)
     );
   }
 
   public SingularityRequestParent scale(
     String requestId,
     SingularityScaleRequest scaleRequest,
     SingularityUser user
+  ) {
+    return scale(requestId, scaleRequest, user, Optional.empty());
+  }
+
+  public SingularityRequestParent scale(
+    String requestId,
+    SingularityScaleRequest scaleRequest,
+    SingularityUser user,
+    Optional<Boolean> largeScaleDownAcknowledged
   ) {
     SingularityRequestWithState oldRequestWithState = fetchRequestWithState(
       requestId,
@@ -1808,7 +1825,11 @@ public SingularityRequestParent scale(
       .toBuilder()
       .setInstances(scaleRequest.getInstances())
       .build();
-    validator.checkScale(newRequest, Optional.<Integer>empty(), false);
+    validator.checkScale(
+      newRequest,
+      oldRequest.getInstances(),
+      largeScaleDownAcknowledged
+    );
 
     checkBadRequest(
       oldRequest.getInstancesSafe() != newRequest.getInstancesSafe(),
@@ -1871,7 +1892,8 @@ public SingularityRequestParent scale(
         scaleRequest.getSkipHealthchecks(),
         Optional.of(scaleMessage),
         Optional.of(bounceRequest),
-        user
+        user,
+        largeScaleDownAcknowledged
       );
     } else {
       submitRequest(
@@ -1881,7 +1903,8 @@ public SingularityRequestParent scale(
         scaleRequest.getSkipHealthchecks(),
         Optional.of(scaleMessage),
         Optional.empty(),
-        user
+        user,
+        largeScaleDownAcknowledged
       );
     }
 
@@ -2117,7 +2140,8 @@ public SingularityRequestParent skipHealthchecks(
       Optional.empty(),
       skipHealthchecksRequest.getMessage(),
       Optional.empty(),
-      user
+      user,
+      Optional.empty()
     );
 
     if (skipHealthchecksRequest.getDurationMillis().isPresent()) {