test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-02 04:08:31 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

[Fix][Monitor]Monitor UI not show DisakAvailable and MemoryUsage correctly (#11870)

Browse Source
This commit is contained in:
LiuBodong 2022-09-11 19:11:03 +08:00 committed by GitHub
parent c3a8dd5ca7
commit 3ca9680b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/MasterHeartBeat.java
View File

@ -35,5 +35,6 @@ public class MasterHeartBeat implements HeartBeat {
private double availablePhysicalMemorySize; private double availablePhysicalMemorySize;
private double maxCpuloadAvg; private double maxCpuloadAvg;
private double reservedMemory; private double reservedMemory;
private double diskAvailable;
private int processId; private int processId;
} }

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerHeartBeat.java
View File

@ -36,6 +36,7 @@ public class WorkerHeartBeat implements HeartBeat {
private double availablePhysicalMemorySize; private double availablePhysicalMemorySize;
private double maxCpuloadAvg; private double maxCpuloadAvg;
private double reservedMemory; private double reservedMemory;
private double diskAvailable;
private int serverStatus; private int serverStatus;
private int processId; private int processId;

2
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/task/MasterHeartBeatTask.java
View File

@ -57,6 +57,8 @@ public class MasterHeartBeatTask extends BaseHeartBeatTask<MasterHeartBeat> {
.availablePhysicalMemorySize(OSUtils.availablePhysicalMemorySize()) .availablePhysicalMemorySize(OSUtils.availablePhysicalMemorySize())
.maxCpuloadAvg(masterConfig.getMaxCpuLoadAvg()) .maxCpuloadAvg(masterConfig.getMaxCpuLoadAvg())
.reservedMemory(masterConfig.getReservedMemory()) .reservedMemory(masterConfig.getReservedMemory())
.memoryUsage(OSUtils.memoryUsage())
.diskAvailable(OSUtils.diskAvailable())
.processId(processId) .processId(processId)
.build(); .build();
} }

2
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java
View File

@ -68,7 +68,9 @@ public class WorkerHeartBeatTask extends BaseHeartBeatTask<WorkerHeartBeat> {
.loadAverage(loadAverage) .loadAverage(loadAverage)
.availablePhysicalMemorySize(availablePhysicalMemorySize) .availablePhysicalMemorySize(availablePhysicalMemorySize)
.maxCpuloadAvg(maxCpuLoadAvg) .maxCpuloadAvg(maxCpuLoadAvg)
.memoryUsage(OSUtils.memoryUsage())
.reservedMemory(reservedMemory) .reservedMemory(reservedMemory)
.diskAvailable(OSUtils.diskAvailable())
.processId(processId) .processId(processId)
.workerHostWeight(workerConfig.getHostWeight()) .workerHostWeight(workerConfig.getHostWeight())
.workerWaitingTaskCount(this.workerWaitingTaskCount.get()) .workerWaitingTaskCount(this.workerWaitingTaskCount.get())