From 51df429a803189118abc0e271efe41a60e67fc06 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Thu, 21 May 2020 19:01:01 +0800 Subject: [PATCH] add not worker log and remove worker invalid property (#2784) * add LoggerServerTest UT * add LoggerServerTest UT * add LoggerServerTest UT add RemoveTaskLogRequestCommandTest UT add RemoveTaskLogResponseCommandTest * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * master select worker filter high load worker #2704 * add not worker log and remove worker invalid property Co-authored-by: qiaozhanwei --- .../server/master/dispatch/ExecutorDispatcher.java | 5 ++++- .../server/master/processor/TaskAckProcessor.java | 2 +- dolphinscheduler-server/src/main/resources/worker.properties | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/ExecutorDispatcher.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/ExecutorDispatcher.java index 605297aadf..34c8c8e285 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/ExecutorDispatcher.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/ExecutorDispatcher.java @@ -81,9 +81,12 @@ public class ExecutorDispatcher implements InitializingBean { /** * host select */ + Host host = hostManager.select(context); if (StringUtils.isEmpty(host.getAddress())) { - throw new ExecuteException(String.format("fail to execute : %s due to no worker ", context.getCommand())); + throw new ExecuteException(String.format("fail to execute : %s due to no suitable worker , " + + "current task need to %s worker group execute", + context.getCommand(),context.getWorkerGroup())); } context.setHost(host); executorManager.beforeExecute(context); diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessor.java index 3460248dfb..7bc37590aa 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessor.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessor.java @@ -70,7 +70,7 @@ public class TaskAckProcessor implements NettyRequestProcessor { } /** - * task ack process + * task ack process * @param channel channel channel * @param command command TaskExecuteAckCommand */ diff --git a/dolphinscheduler-server/src/main/resources/worker.properties b/dolphinscheduler-server/src/main/resources/worker.properties index 9bbf90102c..eb01bbb3ab 100644 --- a/dolphinscheduler-server/src/main/resources/worker.properties +++ b/dolphinscheduler-server/src/main/resources/worker.properties @@ -21,9 +21,6 @@ # worker heartbeat interval #worker.heartbeat.interval=10 -# submit the number of tasks at a time TODO -#worker.fetch.task.num = 3 - # only less than cpu avg load, worker server can work. default value -1: the number of cpu cores * 2 #worker.max.cpuload.avg= -1