Browse Source

[Bug][Master] Global taskRetryCheckList clear conflict to killAllTasks in WorkflowExecuteThread (#9678)

2.0.7-release
sparklezzz 3 years ago committed by GitHub
parent
commit
df185242cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

10
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() {

Loading…
Cancel
Save