|
|
@ -667,12 +667,10 @@ public class MasterExecThread implements Runnable { |
|
|
|
List<String> depNameList = taskNode.getDepList(); |
|
|
|
List<String> depNameList = taskNode.getDepList(); |
|
|
|
for(String depsNode : depNameList ){ |
|
|
|
for(String depsNode : depNameList ){ |
|
|
|
if(!dag.containsNode(depsNode) |
|
|
|
if(!dag.containsNode(depsNode) |
|
|
|
|
|
|
|
|| skipTaskNodeList.containsKey(depsNode) |
|
|
|
|| forbiddenTaskList.containsKey(depsNode)){ |
|
|
|
|| forbiddenTaskList.containsKey(depsNode)){ |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
if(skipTaskNodeList.containsKey(depsNode)){ |
|
|
|
|
|
|
|
return DependResult.FAILED; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// all the dependencies must be completed
|
|
|
|
// all the dependencies must be completed
|
|
|
|
if(!completeTaskList.containsKey(depsNode)){ |
|
|
|
if(!completeTaskList.containsKey(depsNode)){ |
|
|
|
return DependResult.WAITING; |
|
|
|
return DependResult.WAITING; |
|
|
|