[dolphinscheduler] branch dev updated: [Bug-14378][Master] Trigger task execution in workflow instance page cause workflow instance keep running status (#14389)

[wenjun]

This is an automated email from the ASF dual-hosted git repository.

wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 64e5741063 [Bug-14378][Master] Trigger task execution in workflow 
instance page cause workflow instance keep running status (#14389)
64e5741063 is described below

commit 64e57410639e2b55ebf85261c205365e1466a90a
Author: Aaron Wang <wangweira...@gmail.com>
AuthorDate: Sat Jun 24 22:10:14 2023 +0800

    [Bug-14378][Master] Trigger task execution in workflow instance page cause 
workflow instance keep running status (#14389)
---
 .../server/master/runner/WorkflowExecuteRunnable.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
index 83d7fb1ca9..e60da71472 100644
--- 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
+++ 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
@@ -2208,14 +2208,14 @@ public class WorkflowExecuteRunnable implements 
Callable<WorkflowSubmitStatus> {
 
         // 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) {