Limit this to services/workers

Author: Rosie Ellis

SingularityService/src/main/java/com/hubspot/singularity/config/SingularityConfiguration.java

@@ -453,7 +453,7 @@ public class SingularityConfiguration extends Configuration {
 
   private boolean skipPersistingTooLongTaskIds = false;
 
-  private boolean allowSettingRequestInstances = false;
+  private boolean allowEmptyRequestInstances = false;
 
   public long getAskDriverToKillTasksAgainAfterMillis() {
     return askDriverToKillTasksAgainAfterMillis;
@@ -2122,11 +2122,11 @@ public void setSkipPersistingTooLongTaskIds(boolean skipPersistingTooLongTaskIds
     this.skipPersistingTooLongTaskIds = skipPersistingTooLongTaskIds;
   }
 
-  public boolean allowSettingRequestInstances() {
-    return allowSettingRequestInstances;
+  public boolean allowEmptyRequestInstances() {
+    return allowEmptyRequestInstances;
   }
 
-  public void setAllowSettingRequestInstances(boolean allowSettingRequestInstances) {
-    this.allowSettingRequestInstances = allowSettingRequestInstances;
+  public void setallowEmptyRequestInstances(boolean allowEmptyRequestInstances) {
+    this.allowEmptyRequestInstances = allowEmptyRequestInstances;
   }
 }

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

@@ -231,7 +231,7 @@ public SingularityRequest checkSingularityRequest(
       request.getId()
     );
 
-    if (singularityConfiguration.allowSettingRequestInstances()) {
+    if (singularityConfiguration.allowEmptyRequestInstances()) {
       checkBadRequest(
         (
           !existingRequest.flatMap(SingularityRequest::getInstances).isPresent() &&
@@ -242,6 +242,10 @@ public SingularityRequest checkSingularityRequest(
       );
 
       if (
+        (
+          request.getRequestType().equals(RequestType.SERVICE) ||
+          request.getRequestType().equals(RequestType.WORKER)
+        ) &&
         existingRequest.flatMap(SingularityRequest::getInstances).isPresent() &&
         !request.getInstances().isPresent()
       ) {