Browse Source

[DS-6737][MasterServer] fix event handle twice (#6738)

Co-authored-by: caishunfeng <534328519@qq.com>
3.0.0/version-upgrade
wind 3 years ago committed by GitHub
parent
commit
b6824b4741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

11
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

@ -105,10 +105,7 @@ public class WorkflowExecuteThread implements Runnable {
* runing TaskNode * runing TaskNode
*/ */
private final Map<Integer, ITaskProcessor> activeTaskProcessorMaps = new ConcurrentHashMap<>(); private final Map<Integer, ITaskProcessor> activeTaskProcessorMaps = new ConcurrentHashMap<>();
/**
* task exec service
*/
private final ExecutorService taskExecService;
/** /**
* process instance * process instance
*/ */
@ -217,9 +214,6 @@ public class WorkflowExecuteThread implements Runnable {
this.processInstance = processInstance; this.processInstance = processInstance;
this.masterConfig = masterConfig; this.masterConfig = masterConfig;
int masterTaskExecNum = masterConfig.getMasterExecTaskNum();
this.taskExecService = ThreadUtils.newDaemonFixedThreadExecutor("Master-Task-Exec-Thread",
masterTaskExecNum);
this.nettyExecutorManager = nettyExecutorManager; this.nettyExecutorManager = nettyExecutorManager;
this.processAlertManager = processAlertManager; this.processAlertManager = processAlertManager;
this.taskTimeoutCheckList = taskTimeoutCheckList; this.taskTimeoutCheckList = taskTimeoutCheckList;
@ -228,8 +222,11 @@ public class WorkflowExecuteThread implements Runnable {
@Override @Override
public void run() { public void run() {
try { try {
if (!this.isStart()) {
startProcess(); startProcess();
} else {
handleEvents(); handleEvents();
}
} catch (Exception e) { } catch (Exception e) {
logger.error("handler error:", e); logger.error("handler error:", e);
} }

Loading…
Cancel
Save