diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/FailoverExecuteThread.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/FailoverExecuteThread.java index 144baf2dab..5dbd6e90df 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/FailoverExecuteThread.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/FailoverExecuteThread.java @@ -64,8 +64,8 @@ public class FailoverExecuteThread extends Thread { @Override public void run() { + logger.info("failover execute thread started"); while (Stopper.isRunning()) { - logger.info("failover execute started"); try { List hosts = getNeedFailoverMasterServers(); if (CollectionUtils.isEmpty(hosts)) { diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java index 229d9088cc..8edad98036 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java @@ -84,7 +84,7 @@ public class WorkflowExecuteThreadPool extends ThreadPoolTaskExecutor { public void submitStateEvent(StateEvent stateEvent) { WorkflowExecuteThread workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(stateEvent.getProcessInstanceId()); if (workflowExecuteThread == null) { - logger.error("workflowExecuteThread is null, processInstanceId:{}", stateEvent.getProcessInstanceId()); + logger.warn("workflowExecuteThread is null, stateEvent:{}", stateEvent); return; } workflowExecuteThread.addStateEvent(stateEvent); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java index 3d1c518e51..73e1b1693b 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java @@ -54,7 +54,7 @@ public class CommonTaskProcessor extends BaseTaskProcessor { if (this.taskInstance == null) { return false; } - this.setTaskExecutionLogger(); + int taskGroupId = taskInstance.getTaskGroupId(); if (taskGroupId > 0) { boolean acquireTaskGroup = processService.acquireTaskGroup(taskInstance.getId(),