Merge 192eae5 into 717013a

Netflix · Apr 1, 2020 · b3484b9 · b3484b9
2 parents 717013a + 192eae5
commit b3484b9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/...in/java/com/netflix/genie/agent/execution/services/impl/grpc/GRpcAgentJobServiceImpl.java b/...in/java/com/netflix/genie/agent/execution/services/impl/grpc/GRpcAgentJobServiceImpl.java
@@ -303,6 +303,7 @@ private JobSpecification throwForJobSpecificationError(
             case NO_CLUSTER_FOUND:
             case NO_JOB_FOUND:
             case NO_COMMAND_FOUND:
+            case RESOLUTION_FAILED:
                 throw new JobSpecificationResolutionException(
                     "Failed to obtain specification: "
                         + error.getType().name()

diff --git a/...y/com/netflix/genie/agent/execution/services/impl/grpc/GRpcAgentJobServiceImplSpec.groovy b/...y/com/netflix/genie/agent/execution/services/impl/grpc/GRpcAgentJobServiceImplSpec.groovy
@@ -244,6 +244,7 @@ class GRpcAgentJobServiceImplSpec extends Specification {
         JobSpecificationError.Type.NO_CLUSTER_FOUND     | JobSpecificationResolutionException
         JobSpecificationError.Type.NO_JOB_FOUND         | JobSpecificationResolutionException
         JobSpecificationError.Type.NO_COMMAND_FOUND     | JobSpecificationResolutionException
+        JobSpecificationError.Type.RESOLUTION_FAILED    | JobSpecificationResolutionException
         JobSpecificationError.Type.UNKNOWN              | GenieRuntimeException
     }
 
@@ -303,6 +304,7 @@ class GRpcAgentJobServiceImplSpec extends Specification {
         JobSpecificationError.Type.NO_CLUSTER_FOUND     | JobSpecificationResolutionException
         JobSpecificationError.Type.NO_JOB_FOUND         | JobSpecificationResolutionException
         JobSpecificationError.Type.NO_COMMAND_FOUND     | JobSpecificationResolutionException
+        JobSpecificationError.Type.RESOLUTION_FAILED    | JobSpecificationResolutionException
         JobSpecificationError.Type.UNKNOWN              | GenieRuntimeException
     }
 
@@ -379,6 +381,7 @@ class GRpcAgentJobServiceImplSpec extends Specification {
         JobSpecificationError.Type.NO_CLUSTER_FOUND     | JobSpecificationResolutionException
         JobSpecificationError.Type.NO_JOB_FOUND         | JobSpecificationResolutionException
         JobSpecificationError.Type.NO_COMMAND_FOUND     | JobSpecificationResolutionException
+        JobSpecificationError.Type.RESOLUTION_FAILED    | JobSpecificationResolutionException
         JobSpecificationError.Type.UNKNOWN              | GenieRuntimeException
     }
 

diff --git a/genie-proto/src/main/proto/genie.proto b/genie-proto/src/main/proto/genie.proto
@@ -177,6 +177,7 @@ message JobSpecificationError {
         NO_JOB_FOUND = 4;
         NO_SPECIFICATION_FOUND = 5;
         INVALID_REQUEST = 6;
+        RESOLUTION_FAILED = 7;
     }
     Type type = 1;
     string message = 2;

diff --git a/.../java/com/netflix/genie/web/agent/apis/rpc/v4/endpoints/JobServiceProtoErrorComposer.java b/.../java/com/netflix/genie/web/agent/apis/rpc/v4/endpoints/JobServiceProtoErrorComposer.java
@@ -67,6 +67,8 @@ public class JobServiceProtoErrorComposer {
             .put(GenieApplicationNotFoundException.class, JobSpecificationError.Type.NO_APPLICATION_FOUND)
             .put(GenieJobSpecificationNotFoundException.class, JobSpecificationError.Type.NO_SPECIFICATION_FOUND)
             .put(ConstraintViolationException.class, JobSpecificationError.Type.INVALID_REQUEST)
+            .put(GenieJobResolutionException.class, JobSpecificationError.Type.RESOLUTION_FAILED)
+            .put(GeniePreconditionException.class, JobSpecificationError.Type.RESOLUTION_FAILED)
             .build();
 
     private static final Map<Class<? extends Exception>, ClaimJobError.Type> CLAIM_JOB_ERROR_MAP =

diff --git a/...com/netflix/genie/web/agent/apis/rpc/v4/endpoints/JobServiceProtoErrorComposerSpec.groovy b/...com/netflix/genie/web/agent/apis/rpc/v4/endpoints/JobServiceProtoErrorComposerSpec.groovy
@@ -98,8 +98,9 @@ class JobServiceProtoErrorComposerSpec extends Specification {
         new GenieJobResolutionException(MESSAGE, new GenieCommandNotFoundException(MESSAGE))          | JobSpecificationError.Type.NO_COMMAND_FOUND
         new GenieJobResolutionException(MESSAGE, new GenieApplicationNotFoundException(MESSAGE))      | JobSpecificationError.Type.NO_APPLICATION_FOUND
         new GenieJobResolutionException(MESSAGE, new GenieJobSpecificationNotFoundException(MESSAGE)) | JobSpecificationError.Type.NO_SPECIFICATION_FOUND
-        new GenieJobResolutionException(MESSAGE)                                                      | JobSpecificationError.Type.UNKNOWN
-        new GenieJobResolutionException(new Throwable(MESSAGE))                                       | JobSpecificationError.Type.UNKNOWN
+        new GenieJobResolutionException(MESSAGE, new GeniePreconditionException(MESSAGE))             | JobSpecificationError.Type.RESOLUTION_FAILED
+        new GenieJobResolutionException(MESSAGE)                                                      | JobSpecificationError.Type.RESOLUTION_FAILED
+        new GenieJobResolutionException(new Throwable(MESSAGE))                                       | JobSpecificationError.Type.RESOLUTION_FAILED
     }
 
     @Unroll