natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
WangJPLeo 2022-07-09 16:41:51 +08:00 committed by GitHub
parent 057a9f6b24
commit b5653ea7f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
View File

@ -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;
}

1
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/BlockingTaskTest.java
View File

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