Browse Source

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

LiuBodong 2 years ago
parent
commit
3ca9680b20

+ 1 - 0
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/MasterHeartBeat.java

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

+ 1 - 0
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerHeartBeat.java

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

+ 2 - 0
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/task/MasterHeartBeatTask.java

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

+ 2 - 0
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/task/WorkerHeartBeatTask.java

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