lhjzmn commented on a change in pull request #7613:
URL: https://github.com/apache/dolphinscheduler/pull/7613#discussion_r775333099
##########
File path:
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -1083,34 +1083,51 @@ private DependResult isTaskDepsComplete(String
taskCode) {
return DependResult.SUCCESS;
}
TaskNode taskNode = dag.getNode(taskCode);
- List<String> depCodeList = taskNode.getDepList();
- for (String depsNode : depCodeList) {
- if (!dag.containsNode(depsNode)
- || forbiddenTaskMap.containsKey(depsNode)
- || skipTaskNodeMap.containsKey(depsNode)) {
- continue;
- }
- // dependencies must be fully completed
- if (!completeTaskMap.containsKey(depsNode)) {
- return DependResult.WAITING;
- }
- Integer depsTaskId = completeTaskMap.get(depsNode);
- ExecutionStatus depTaskState =
taskInstanceMap.get(depsTaskId).getState();
- if (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) {
- return DependResult.NON_EXEC;
- }
- // ignore task state if current task is condition
- if (taskNode.isConditionsTask()) {
- continue;
- }
- if (!dependTaskSuccess(depsNode, taskCode)) {
- return DependResult.FAILED;
+ List<String> indirectDepCodeList = new ArrayList<>();
+ getIndirectDepList(taskCode, indirectDepCodeList);
+ for (String depsNode : indirectDepCodeList) {
+ if (dag.containsNode(depsNode) &&
!skipTaskNodeMap.containsKey(depsNode)) {
+ // dependencies must be fully completed
+ if (!completeTaskMap.containsKey(depsNode)) {
+ return DependResult.WAITING;
+ }
+ Integer depsTaskId = completeTaskMap.get(depsNode);
+ ExecutionStatus depTaskState =
taskInstanceMap.get(depsTaskId).getState();
+ if (depTaskState.typeIsPause() || depTaskState.typeIsCancel())
{
+ return DependResult.NON_EXEC;
+ }
+ // ignore task state if current task is condition
+ if (taskNode.isConditionsTask()) {
+ continue;
+ }
+ if (!dependTaskSuccess(depsNode, taskCode)) {
+ return DependResult.FAILED;
+ }
}
}
logger.info("taskCode: {} completeDependTaskList: {}", taskCode,
Arrays.toString(completeTaskMap.keySet().toArray()));
return DependResult.SUCCESS;
}
+ /**
+ * This function is specially used to handle the dependency situation
where the parent node is a prohibited node.
+ * When the parent node is a forbidden node, the dependency relationship
should continue to be traced
+ *
+ * @param taskCode taskCode
+ * @param indirectDepCodeList All indirectly dependent nodes
+ */
+ private void getIndirectDepList(String taskCode, List<String>
indirectDepCodeList) {
Review comment:
Yes, this is my mistake. I modified the method name.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
