This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 51df429 add not worker log and remove worker invalid property (#2784)
51df429 is described below
commit 51df429a803189118abc0e271efe41a60e67fc06
Author: qiaozhanwei <[email protected]>
AuthorDate: Thu May 21 19:01:01 2020 +0800
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 <[email protected]>
---
.../dolphinscheduler/server/master/dispatch/ExecutorDispatcher.java | 5 ++++-
.../dolphinscheduler/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 605297a..34c8c8e 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 3460248..7bc3759 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 9bbf901..eb01bbb 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
