Browse Source

fix bug 4010: remove failed condition tasks from error-task-list. (#4011)

Co-authored-by: baoliang <baoliang@analysys.com.cn>
pull/3/MERGE
bao liang 4 years ago committed by GitHub
parent
commit
389c90ead6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

8
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

@ -312,11 +312,12 @@ public class MasterExecThread implements Runnable {
* @throws Exception exception * @throws Exception exception
*/ */
private void prepareProcess() throws Exception { private void prepareProcess() throws Exception {
// init task queue
initTaskQueue();
// gen process dag // gen process dag
buildFlowDag(); buildFlowDag();
// init task queue
initTaskQueue();
logger.info("prepare process :{} end", processInstance.getId()); logger.info("prepare process :{} end", processInstance.getId());
} }
@ -371,6 +372,9 @@ public class MasterExecThread implements Runnable {
if(task.isTaskComplete()){ if(task.isTaskComplete()){
completeTaskList.put(task.getName(), task); completeTaskList.put(task.getName(), task);
} }
if(task.isConditionsTask() || DagHelper.haveConditionsAfterNode(task.getName(), dag)){
continue;
}
if(task.getState().typeIsFailure() && !task.taskCanRetry()){ if(task.getState().typeIsFailure() && !task.taskCanRetry()){
errorTaskList.put(task.getName(), task); errorTaskList.put(task.getName(), task);
} }

Loading…
Cancel
Save