Omit on demand jobs from scale limit in deploy validation

Paul Schoenfelder · Paul Schoenfelder · commit 1ad34dd1beb7 · 2022-04-11T16:25:48.000-04:00
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/data/SingularityValidator.java b/SingularityService/src/main/java/com/hubspot/singularity/data/SingularityValidator.java
@@ -1244,7 +1244,9 @@ public void checkScale(
       }
     }
 
-    if (previousScale.isPresent() && !largeScaleDownAcknowledged.orElse(false)) {
+    if (previousScale.isPresent() &&
+        !largeScaleDownAcknowledged.orElse(false) &&
+        request.getRequestType() != RequestType.ON_DEMAND) {
       int absMaxScaleDown = singularityConfiguration.getMaxScaleDownWithoutAcknowledgement();
       boolean scaleDownExceedsAbsoluteMax =
         previousScale.get() - request.getInstancesSafe() > absMaxScaleDown;

Original file line number	Diff line number	Diff line change
`@@ -1244,7 +1244,9 @@ public void checkScale(`
`1244`	`1244`	`}`
`1245`	`1245`	`}`
`1246`	`1246`
`1247`		`- if (previousScale.isPresent() && !largeScaleDownAcknowledged.orElse(false)) {`
	`1247`	`+ if (previousScale.isPresent() &&`
	`1248`	`+ !largeScaleDownAcknowledged.orElse(false) &&`
	`1249`	`+ request.getRequestType() != RequestType.ON_DEMAND) {`
`1248`	`1250`	`int absMaxScaleDown = singularityConfiguration.getMaxScaleDownWithoutAcknowledgement();`
`1249`	`1251`	`boolean scaleDownExceedsAbsoluteMax =`
`1250`	`1252`	`previousScale.get() - request.getInstancesSafe() > absMaxScaleDown;`