Merge aff434c into 5cbe170

apache · Jun 21, 2023 · 1ab1d6a · 1ab1d6a
2 parents 5cbe170 + aff434c
commit 1ab1d6a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...c/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java b/...c/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
@@ -2208,14 +2208,14 @@ protected void clearDataIfExecuteTask() {
 
         // remove task instance from taskInstanceMap, completeTaskSet, validTaskMap, errorTaskMap
         // completeTaskSet remove dependency taskInstanceMap, so the sort can't change
-        completeTaskSet.removeIf(set -> {
-            Optional<TaskInstance> existTaskInstanceOptional = getTaskInstance(set);
+        completeTaskSet.removeIf(taskCode -> {
+            Optional<TaskInstance> existTaskInstanceOptional = getTaskInstance(taskCode);
             return existTaskInstanceOptional
-                    .filter(taskInstance -> dag.containsNode(Integer.toString(taskInstance.getId()))).isPresent();
+                    .filter(taskInstance -> dag.containsNode(Long.toString(taskInstance.getTaskCode()))).isPresent();
         });
-        taskInstanceMap.entrySet().removeIf(map -> dag.containsNode(Long.toString(map.getValue().getTaskCode())));
-        validTaskMap.entrySet().removeIf(map -> dag.containsNode(Long.toString(map.getKey())));
-        errorTaskMap.entrySet().removeIf(map -> dag.containsNode(Long.toString(map.getKey())));
+        taskInstanceMap.entrySet().removeIf(entry -> dag.containsNode(Long.toString(entry.getValue().getTaskCode())));
+        validTaskMap.entrySet().removeIf(entry -> dag.containsNode(Long.toString(entry.getKey())));
+        errorTaskMap.entrySet().removeIf(entry -> dag.containsNode(Long.toString(entry.getKey())));
     }
 
     private void saveCacheTaskInstance(TaskInstance taskInstance) {