Fix Workflow Build Failure

LaurinmyReha · Mar 31, 2021 · cc46f9d · cc46f9d
1 parent 6ac0587
commit cc46f9d
Show file tree

Hide file tree

Showing 30 changed files with 22 additions and 10,204 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ dist/
 .coverage
 .github/actions/
 .github/.DS_Store
-.DS_Store
+.DS_Store
+frontend/server/src/main/java/org/pytorch/serve/grpc/
diff --git a/frontend/server/src/main/java/org/pytorch/serve/ensemble/DagExecutor.java b/frontend/server/src/main/java/org/pytorch/serve/ensemble/DagExecutor.java
@@ -7,7 +7,6 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.*;
-
 import org.pytorch.serve.archive.model.ModelNotFoundException;
 import org.pytorch.serve.archive.model.ModelVersionNotFoundException;
 import org.pytorch.serve.http.InternalServerException;
@@ -72,8 +71,9 @@ public ArrayList<NodeOutput> execute(RequestInput input, ArrayList<String> topoS
 
                 try {
                     Future<NodeOutput> op = executorCompletionService.take();
-                    if(op == null){
-                        throw new ExecutionException(new RuntimeException("WorkflowNode result empty"));
+                    if (op == null) {
+                        throw new ExecutionException(
+                                new RuntimeException("WorkflowNode result empty"));
                     } else {
                         outputs.add(op.get());
                     }
@@ -135,7 +135,8 @@ public ArrayList<NodeOutput> execute(RequestInput input, ArrayList<String> topoS
         return leafOutputs;
     }
 
-    private NodeOutput invokeModel(String nodeName, WorkflowModel workflowModel, RequestInput input, int retryAttempt)
+    private NodeOutput invokeModel(
+            String nodeName, WorkflowModel workflowModel, RequestInput input, int retryAttempt)
             throws ModelNotFoundException, ModelVersionNotFoundException, ExecutionException,
                     InterruptedException {
         try {
@@ -148,12 +149,18 @@ private NodeOutput invokeModel(String nodeName, WorkflowModel workflowModel, Req
             return new NodeOutput(nodeName, resp);
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             logger.error(e.getMessage());
-            if(retryAttempt < workflowModel.getRetryAttempts()){
-                logger.error(String.format("Timed out while executing %s for attempt %d", nodeName, retryAttempt));
+            if (retryAttempt < workflowModel.getRetryAttempts()) {
+                logger.error(
+                        String.format(
+                                "Timed out while executing %s for attempt %d",
+                                nodeName, retryAttempt));
                 return invokeModel(nodeName, workflowModel, input, ++retryAttempt);
             } else {
                 logger.error(nodeName + " : " + e.getMessage());
-                throw new InternalServerException(String.format("Failed to execute workflow Node after %d attempts : Error executing %s", retryAttempt, nodeName)); // NOPMD
+                throw new InternalServerException(
+                        String.format(
+                                "Failed to execute workflow Node after %d attempts : Error executing %s",
+                                retryAttempt, nodeName)); // NOPMD
             }
         } catch (ModelNotFoundException e) {
             logger.error("Model not found.");

diff --git a/frontend/server/src/main/java/org/pytorch/serve/grpc/inference/Inference.java b/frontend/server/src/main/java/org/pytorch/serve/grpc/inference/Inference.java