This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 731123cebc [Bug][Worker] get worker status bug (#13992)
731123cebc is described below
commit 731123cebc75ba09a386b9c1ecf72e9528d3cb2d
Author: Aaron Wang <[email protected]>
AuthorDate: Mon Apr 24 09:51:47 2023 +0800
[Bug][Worker] get worker status bug (#13992)
* get worker status bug
* modify configuration name
---
docs/docs/en/architecture/load-balance.md | 4 ++--
docs/docs/zh/architecture/load-balance.md | 4 ++--
.../dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/docs/en/architecture/load-balance.md
b/docs/docs/en/architecture/load-balance.md
index f58f864128..92504720e6 100644
--- a/docs/docs/en/architecture/load-balance.md
+++ b/docs/docs/en/architecture/load-balance.md
@@ -55,6 +55,6 @@ If either of these is lower than the configured item, then
this worker will not
You can customise the configuration by changing the following properties in
worker.properties
-- worker.max.cpuload.avg=-1 (worker max cpuload avg, only higher than the
system cpu load average, worker server can be dispatched tasks. default value
-1: the number of cpu cores * 2)
-- worker.reserved.memory=0.3 (worker reserved memory, only lower than system
available memory, worker server can be dispatched tasks. default value 0.3, the
unit is G)
+- worker.max.cpu.load.avg=-1 (worker max cpu load avg, only higher than the
system cpu load average, worker server can be dispatched tasks. default value
-1: the number of cpu cores * 2)
+- worker.reserved.memory=0.3 (worker reserved memory, only lower than system
available memory, worker server can be dispatched tasks. default value 0.3, the
unit is percentage)
diff --git a/docs/docs/zh/architecture/load-balance.md
b/docs/docs/zh/architecture/load-balance.md
index 6baeb167ad..6c1cfa9ee3 100644
--- a/docs/docs/zh/architecture/load-balance.md
+++ b/docs/docs/zh/architecture/load-balance.md
@@ -55,6 +55,6 @@ eg：master.host.selector=random（不区分大小写）
你可以在 worker.properties 修改下面的属性来自定义配置
-* worker.max.cpuload.avg=-1
(worker最大cpuload均值，只有高于系统cpuload均值时，worker服务才能被派发任务. 默认值为-1: cpu cores * 2)
-* worker.reserved.memory=0.3 (worker预留内存，只有低于系统可用内存时，worker服务才能被派发任务，单位为G)
+* worker.max.cpu.load.avg=-1 (worker最大cpu load均值，只有高于系统cpu
load均值时，worker服务才能被派发任务. 默认值为-1: cpu cores * 2)
+* worker.reserved.memory=0.3 (worker预留内存，只有低于系统可用内存时，worker服务才能被派发任务，单位为百分比)
diff --git
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java
index 3a52ea5ff9..7b0dbe60e7 100644
---
a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java
+++
b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java
@@ -94,10 +94,10 @@ public class WorkerHeartBeatTask extends
BaseHeartBeatTask<WorkerHeartBeat> {
double reservedMemory,
int workerExecThreadCount,
int workerWaitingTaskCount) {
- if (cpuUsagePercentage > maxCpuUsePercentage || memoryUsagePercentage
< reservedMemory) {
+ if (cpuUsagePercentage > maxCpuUsePercentage || (1 -
memoryUsagePercentage) < reservedMemory) {
log.warn(
- "current cpu load average {} is higher than {}
max.cpuload.avg or available memory {} is lower than {} reserved.memory={}",
- cpuUsagePercentage, maxCpuUsePercentage,
memoryUsagePercentage, reservedMemory);
+ "current cpu load average {} is higher than {} or
available memory {} is lower than {}",
+ cpuUsagePercentage, maxCpuUsePercentage, 1 -
memoryUsagePercentage, reservedMemory);
return Constants.ABNORMAL_NODE_STATUS;
} else if (workerWaitingTaskCount > workerExecThreadCount) {
log.warn("current waiting task count {} is large than worker
thread count {}, worker is busy",
