|
|
@ -520,9 +520,6 @@ public class MasterExecThread implements Runnable { |
|
|
|
taskInstance.setDelayTime(taskNode.getDelayTime()); |
|
|
|
taskInstance.setDelayTime(taskNode.getDelayTime()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//get pre task ,get all the task varPool to this task
|
|
|
|
|
|
|
|
Set<String> preTask = dag.getPreviousNodes(taskInstance.getName()); |
|
|
|
|
|
|
|
getPreVarPool(taskInstance, preTask); |
|
|
|
|
|
|
|
return taskInstance; |
|
|
|
return taskInstance; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1154,6 +1151,12 @@ public class MasterExecThread implements Runnable { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//init varPool only this task is the first time running
|
|
|
|
|
|
|
|
if (task.isFirstRun()) { |
|
|
|
|
|
|
|
//get pre task ,get all the task varPool to this task
|
|
|
|
|
|
|
|
Set<String> preTask = dag.getPreviousNodes(task.getName()); |
|
|
|
|
|
|
|
getPreVarPool(task, preTask); |
|
|
|
|
|
|
|
} |
|
|
|
DependResult dependResult = getDependResultForTask(task); |
|
|
|
DependResult dependResult = getDependResultForTask(task); |
|
|
|
if (DependResult.SUCCESS == dependResult) { |
|
|
|
if (DependResult.SUCCESS == dependResult) { |
|
|
|
if (retryTaskIntervalOverTime(task)) { |
|
|
|
if (retryTaskIntervalOverTime(task)) { |
|
|
|