Skip to content

Commit 389c90e

Browse files
lenboobaoliang
and
baoliang
authored
fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <[email protected]>
1 parent b01898a commit 389c90e

File tree

1 file changed

+6
-2
lines changed
  • dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner

1 file changed

+6
-2
lines changed

Diff for: dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,12 @@ private void executeComplementProcess() throws Exception {
312312
* @throws Exception exception
313313
*/
314314
private void prepareProcess() throws Exception {
315-
// init task queue
316-
initTaskQueue();
317315

318316
// gen process dag
319317
buildFlowDag();
318+
319+
// init task queue
320+
initTaskQueue();
320321
logger.info("prepare process :{} end", processInstance.getId());
321322
}
322323

@@ -371,6 +372,9 @@ private void initTaskQueue(){
371372
if(task.isTaskComplete()){
372373
completeTaskList.put(task.getName(), task);
373374
}
375+
if(task.isConditionsTask() || DagHelper.haveConditionsAfterNode(task.getName(), dag)){
376+
continue;
377+
}
374378
if(task.getState().typeIsFailure() && !task.taskCanRetry()){
375379
errorTaskList.put(task.getName(), task);
376380
}

0 commit comments

Comments
 (0)