未验证 提交 389c90ea 编写于 作者: B bao liang 提交者: GitHub

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

Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
上级 b01898a8
...@@ -312,11 +312,12 @@ public class MasterExecThread implements Runnable { ...@@ -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 { ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册