[dolphinscheduler] branch 2.0.6-prepare updated: [Bug][Master] Global taskRetryCheckList clear conflict to killAllTasks in WorkflowExecuteThread (#9678)

[zhongjiajie]

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

zhongjiajie pushed a commit to branch 2.0.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.6-prepare by this push:
     new df185242cf [Bug][Master] Global taskRetryCheckList clear conflict to 
killAllTasks in WorkflowExecuteThread (#9678)
df185242cf is described below

commit df185242cf29a165d48cee5c269a697bc27d214e
Author: sparklezzz <zhang.xd...@gmail.com>
AuthorDate: Sun Apr 24 11:39:03 2022 +0800

    [Bug][Master] Global taskRetryCheckList clear conflict to killAllTasks in 
WorkflowExecuteThread (#9678)
---
 .../server/master/runner/WorkflowExecuteThread.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
index 7527daa3dd..2cad3b7579 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -1333,6 +1333,11 @@ public class WorkflowExecuteThread implements Runnable {
         }
 
         for (int taskId : activeTaskProcessorMaps.keySet()) {
+            if (taskRetryCheckList.containsKey(taskId)) {
+                taskRetryCheckList.remove(taskId);
+                logger.info("task id {} removed from taskRetryCheckList", 
taskId);
+            }
+
             TaskInstance taskInstance = 
processService.findTaskInstanceById(taskId);
             if (taskInstance == null || 
taskInstance.getState().typeIsFinished()) {
                 continue;
@@ -1348,10 +1353,7 @@ public class WorkflowExecuteThread implements Runnable {
             }
         }
 
-        if (taskRetryCheckList.size() > 0) {
-            this.taskRetryCheckList.clear();
-            this.addProcessStopEvent(processInstance);
-        }
+        this.addProcessStopEvent(processInstance);
     }
 
     public boolean workFlowFinish() {