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
3.0.0/version-upgrade
WangJPLeo 2 years ago committed by caishunfeng
parent
commit
7b7ec0f20f
  1. 4
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
  2. 1
      dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/BlockingTaskTest.java

4
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

@ -720,7 +720,9 @@ public class WorkflowExecuteThread {
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

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

Loading…
Cancel
Save