Browse Source

Complement numbers will run in a loop under the serial strategy fixed. (#10862)

* Complement numbers will run in a loop under the serial strategy fixed.

* e2e rerun
WangJPLeo 2 years ago
parent
commit
b5653ea7f2

+ 3 - 1
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java

@@ -592,7 +592,9 @@ public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatue> {
             return false;
         }
 
-        if (processInstance.getState() == ExecutionStatus.READY_STOP) {
+        // when the serial complement is executed, the next complement instance is created,
+        // and this method does not need to be executed when the parallel complement is used.
+        if (processInstance.getState() == ExecutionStatus.READY_STOP || !processInstance.getState().typeIsFinished()) {
             return false;
         }
 

+ 0 - 1
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/BlockingTaskTest.java

@@ -266,5 +266,4 @@ public class BlockingTaskTest {
         ExecutionStatus status = processInstance.getState();
         Assert.assertEquals(ExecutionStatus.RUNNING_EXECUTION, status);
     }
-
 }