natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into issues/15873

This commit is contained in:
Rick Cheng 2024-05-09 11:37:24 +08:00 committed by GitHub
parent ddfa329cbb bbca37d03e
commit e6dc00d5aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
View File

@ -2120,13 +2120,9 @@ public class WorkflowExecuteRunnable implements IWorkflowExecuteRunnable {
workflowInstance.setVarPool(JSONUtils.toJsonString(processProperties)); workflowInstance.setVarPool(JSONUtils.toJsonString(processProperties));
processInstanceDao.updateById(workflowInstance); processInstanceDao.updateById(workflowInstance);
// remove task instance from taskInstanceMap, completeTaskSet, validTaskMap, errorTaskMap // remove task instance from taskInstanceMap,taskCodeInstanceMap , completeTaskSet, validTaskMap, errorTaskMap
// completeTaskSet remove dependency taskInstanceMap, so the sort can't change completeTaskSet.removeIf(dag::containsNode);
completeTaskSet.removeIf(taskCode -> { taskCodeInstanceMap.entrySet().removeIf(entity -> dag.containsNode(entity.getValue().getTaskCode()));
Optional<TaskInstance> existTaskInstanceOptional = getTaskInstance(taskCode);
return existTaskInstanceOptional
.filter(taskInstance -> dag.containsNode(taskInstance.getTaskCode())).isPresent();
});
taskInstanceMap.entrySet().removeIf(entry -> dag.containsNode(entry.getValue().getTaskCode())); taskInstanceMap.entrySet().removeIf(entry -> dag.containsNode(entry.getValue().getTaskCode()));
validTaskMap.entrySet().removeIf(entry -> dag.containsNode(entry.getKey())); validTaskMap.entrySet().removeIf(entry -> dag.containsNode(entry.getKey()));
errorTaskMap.entrySet().removeIf(entry -> dag.containsNode(entry.getKey())); errorTaskMap.entrySet().removeIf(entry -> dag.containsNode(entry.getKey()));