From 523357f574436b3d6271493d923d2c5ce92bc6fb Mon Sep 17 00:00:00 2001 From: wind Date: Mon, 8 Nov 2021 16:54:58 +0800 Subject: [PATCH] [DS-6737][MasterServer] fix event handle twice (#6738) Co-authored-by: caishunfeng <534328519@qq.com> --- .../master/runner/WorkflowExecuteThread.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 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 f0175c8040..b9a2082ebc 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 @@ -104,10 +104,7 @@ public class WorkflowExecuteThread implements Runnable { * runing TaskNode */ private final Map activeTaskProcessorMaps = new ConcurrentHashMap<>(); - /** - * task exec service - */ - private final ExecutorService taskExecService; + /** * process instance */ @@ -216,9 +213,6 @@ public class WorkflowExecuteThread implements Runnable { this.processInstance = processInstance; this.masterConfig = masterConfig; - int masterTaskExecNum = masterConfig.getMasterExecTaskNum(); - this.taskExecService = ThreadUtils.newDaemonFixedThreadExecutor("Master-Task-Exec-Thread", - masterTaskExecNum); this.nettyExecutorManager = nettyExecutorManager; this.processAlertManager = processAlertManager; this.taskTimeoutCheckList = taskTimeoutCheckList; @@ -227,8 +221,11 @@ public class WorkflowExecuteThread implements Runnable { @Override public void run() { try { - startProcess(); - handleEvents(); + if (!this.isStart()) { + startProcess(); + } else { + handleEvents(); + } } catch (Exception e) { logger.error("handler error:", e); }