Merge pull request #1864 from jinwik/bug-fix

fix priority bug
Netflix · Sep 14, 2020 · 749f922 · 749f922
2 parents db2d1cb + 5c0b41b
commit 749f922
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...on/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java b/...on/src/main/java/com/netflix/conductor/common/metadata/workflow/StartWorkflowRequest.java
@@ -50,7 +50,7 @@ public class StartWorkflowRequest {
 	@ProtoField(id = 8)
 	@Min(value = 0, message = "priority: ${validatedValue} should be minimum {value}")
 	@Max(value = 99, message = "priority: ${validatedValue} should be maximum {value}")
-	private Integer priority;
+	private Integer priority = 0;
 
     public String getName() {
 		return name;

diff --git a/core/src/main/java/com/netflix/conductor/service/WorkflowServiceImpl.java b/core/src/main/java/com/netflix/conductor/service/WorkflowServiceImpl.java
@@ -73,8 +73,9 @@ public WorkflowServiceImpl(WorkflowExecutor workflowExecutor, ExecutionService e
      */
     @Service
     public String startWorkflow(StartWorkflowRequest startWorkflowRequest) {
-        return startWorkflow(startWorkflowRequest.getName(), startWorkflowRequest.getVersion(), startWorkflowRequest.getCorrelationId(), startWorkflowRequest.getInput(),
-                startWorkflowRequest.getExternalInputPayloadStoragePath(), startWorkflowRequest.getTaskToDomain(), startWorkflowRequest.getWorkflowDef());
+        return startWorkflow(startWorkflowRequest.getName(), startWorkflowRequest.getVersion(), startWorkflowRequest.getCorrelationId(),
+            startWorkflowRequest.getPriority(), startWorkflowRequest.getInput(), startWorkflowRequest.getExternalInputPayloadStoragePath(),
+            startWorkflowRequest.getTaskToDomain(), startWorkflowRequest.getWorkflowDef());
     }
 
     /**

diff --git a/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/WorkflowServiceImpl.java b/grpc-server/src/main/java/com/netflix/conductor/grpc/server/service/WorkflowServiceImpl.java
@@ -62,6 +62,7 @@ public void startWorkflow(StartWorkflowRequestPb.StartWorkflowRequest pbRequest,
         try {
             String id = workflowService.startWorkflow(pbRequest.getName(),
                     GRPC_HELPER.optional(request.getVersion()),request.getCorrelationId(),
+                    request.getPriority(),
                     request.getInput(),
                     request.getExternalInputPayloadStoragePath(),
                     request.getTaskToDomain(), request.getWorkflowDef());