Merge branch 'apache:dev' into fix-16978

dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/registry/AlertHeartbeatTask.java

@@ -75,6 +75,7 @@ public AlertServerHeartBeat getHeartBeat() {
                 .cpuUsage(systemMetrics.getSystemCpuUsagePercentage())
                 .memoryUsage(systemMetrics.getSystemMemoryUsedPercentage())
                 .jvmMemoryUsage(systemMetrics.getJvmMemoryUsedPercentage())
+                .diskUsage(systemMetrics.getDiskUsedPercentage())
                 .serverStatus(ServerStatus.NORMAL)
                 .isActive(alertHAServer.isActive())
                 .host(NetUtils.getHost())

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java

@@ -65,7 +65,7 @@ public class MonitorController extends BaseController {
     @ResponseStatus(HttpStatus.OK)
     @ApiException(LIST_MASTERS_ERROR)
     public Result<List<Server>> listServer(@PathVariable("nodeType") RegistryNodeType nodeType) {
-        List<Server> servers = monitorService.listServer(nodeType);
+        final List<Server> servers = monitorService.listServer(nodeType);
         return Result.success(servers);
     }
 

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cluster/ClusterManager.java

@@ -17,6 +17,9 @@
 
 package org.apache.dolphinscheduler.server.master.cluster;
 
+import org.apache.dolphinscheduler.common.model.MasterHeartBeat;
+import org.apache.dolphinscheduler.common.model.WorkerHeartBeat;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.registry.api.RegistryClient;
 import org.apache.dolphinscheduler.registry.api.enums.RegistryNodeType;
 
@@ -36,6 +39,9 @@ public class ClusterManager {
     @Getter
     private WorkerClusters workerClusters;
 
+    @Autowired
+    private MasterSlotManager masterSlotManager;
+
     @Autowired
     private WorkerGroupChangeNotifier workerGroupChangeNotifier;
 
@@ -48,11 +54,48 @@ public ClusterManager() {
     }
 
     public void start() {
+        initializeMasterClusters();
+        initializeWorkerClusters();
+        log.info("ClusterManager started...");
+    }
+
+    /**
+     * Initialize the master clusters.
+     * <p> 1. Register master slot listener once master clusters changed.
+     * <p> 2. Fetch master nodes from registry.
+     * <p> 3. Subscribe the master change event.
+     */
+    private void initializeMasterClusters() {
+        this.masterClusters.registerListener(new MasterSlotChangeListenerAdaptor(masterSlotManager, masterClusters));
+
+        registryClient.getServerList(RegistryNodeType.MASTER).forEach(server -> {
+            final MasterHeartBeat masterHeartBeat =
+                    JSONUtils.parseObject(server.getHeartBeatInfo(), MasterHeartBeat.class);
+            masterClusters.onServerAdded(MasterServerMetadata.parseFromHeartBeat(masterHeartBeat));
+        });
+        log.info("Initialized MasterClusters: {}", JSONUtils.toPrettyJsonString(masterClusters.getServers()));
+
         this.registryClient.subscribe(RegistryNodeType.MASTER.getRegistryPath(), masterClusters);
+    }
+
+    /**
+     * Initialize the worker clusters.
+     * <p> 1. Fetch worker nodes from registry.
+     * <p> 2. Register worker group change notifier once worker clusters changed.
+     * <p> 3. Subscribe the worker change event.
+     */
+    private void initializeWorkerClusters() {
+        registryClient.getServerList(RegistryNodeType.WORKER).forEach(server -> {
+            final WorkerHeartBeat workerHeartBeat =
+                    JSONUtils.parseObject(server.getHeartBeatInfo(), WorkerHeartBeat.class);
+            workerClusters.onServerAdded(WorkerServerMetadata.parseFromHeartBeat(workerHeartBeat));
+        });
+        log.info("Initialized WorkerClusters: {}", JSONUtils.toPrettyJsonString(workerClusters.getServers()));
+
         this.registryClient.subscribe(RegistryNodeType.WORKER.getRegistryPath(), workerClusters);
+
         this.workerGroupChangeNotifier.subscribeWorkerGroupsChange(workerClusters);
         this.workerGroupChangeNotifier.start();
-        log.info("ClusterManager started...");
     }
 
 }

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cluster/IMasterSlotChangeListener.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.server.master.cluster;
+
+import java.util.List;
+
+public interface IMasterSlotChangeListener {
+
+    void onMasterSlotChanged(final List<MasterServerMetadata> normalMasterServers);
+}

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cluster/MasterServerMetadata.java

@@ -17,6 +17,8 @@
 
 package org.apache.dolphinscheduler.server.master.cluster;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import org.apache.dolphinscheduler.common.constants.Constants;
 import org.apache.dolphinscheduler.common.model.MasterHeartBeat;
 
@@ -32,6 +34,7 @@
 public class MasterServerMetadata extends BaseServerMetadata implements Comparable<MasterServerMetadata> {
 
     public static MasterServerMetadata parseFromHeartBeat(final MasterHeartBeat masterHeartBeat) {
+        checkNotNull(masterHeartBeat);
         return MasterServerMetadata.builder()
                 .processId(masterHeartBeat.getProcessId())
                 .serverStartupTime(masterHeartBeat.getStartupTime())

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cluster/MasterSlotChangeListenerAdaptor.java

@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.server.master.cluster;
+
+import java.util.List;
+
+public class MasterSlotChangeListenerAdaptor
+        implements
+            IMasterSlotChangeListener,
+            IClusters.IClustersChangeListener<MasterServerMetadata> {
+
+    private final MasterSlotManager masterSlotManager;
+
+    private final MasterClusters masterClusters;
+
+    public MasterSlotChangeListenerAdaptor(final MasterSlotManager masterSlotManager,
+                                           final MasterClusters masterClusters) {
+        this.masterSlotManager = masterSlotManager;
+        this.masterClusters = masterClusters;
+    }
+
+    @Override
+    public void onMasterSlotChanged(final List<MasterServerMetadata> normalMasterServers) {
+        masterSlotManager.doReBalance(normalMasterServers);
+    }
+
+    @Override
+    public void onServerAdded(MasterServerMetadata server) {
+        onMasterSlotChanged(masterClusters.getNormalServers());
+    }
+
+    @Override
+    public void onServerRemove(MasterServerMetadata server) {
+        onMasterSlotChanged(masterClusters.getNormalServers());
+    }
+
+    @Override
+    public void onServerUpdate(MasterServerMetadata server) {
+        onMasterSlotChanged(masterClusters.getNormalServers());
+    }
+}

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cluster/MasterSlotManager.java

@@ -29,34 +29,14 @@
 @Component
 public class MasterSlotManager implements IMasterSlotReBalancer {
 
-    private final MasterClusters masterClusters;
-
     private final MasterConfig masterConfig;
 
     private volatile int currentSlot = -1;
 
     private volatile int totalSlots = 0;
 
-    public MasterSlotManager(ClusterManager clusterManager, MasterConfig masterConfig) {
+    public MasterSlotManager(final MasterConfig masterConfig) {
         this.masterConfig = masterConfig;
-        this.masterClusters = clusterManager.getMasterClusters();
-        this.masterClusters.registerListener(new IClusters.IClustersChangeListener<MasterServerMetadata>() {
-
-            @Override
-            public void onServerAdded(MasterServerMetadata server) {
-                doReBalance(masterClusters.getNormalServers());
-            }
-
-            @Override
-            public void onServerRemove(MasterServerMetadata server) {
-                doReBalance(masterClusters.getNormalServers());
-            }
-
-            @Override
-            public void onServerUpdate(MasterServerMetadata server) {
-                doReBalance(masterClusters.getNormalServers());
-            }
-        });
     }
 
     /**

dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/cluster/MasterSlotManagerTest.java

@@ -29,16 +29,16 @@ class MasterSlotManagerTest {
 
     private MasterSlotManager masterSlotManager;
 
-    private ClusterManager clusterManager;
+    private MasterClusters masterClusters;
 
     private MasterConfig masterConfig;
 
     @BeforeEach
     public void setUp() {
-        clusterManager = new ClusterManager();
+        masterClusters = new MasterClusters();
         masterConfig = new MasterConfig();
         masterConfig.setMasterAddress("127.0.0.1:5678");
-        masterSlotManager = new MasterSlotManager(clusterManager, masterConfig);
+        masterSlotManager = new MasterSlotManager(masterConfig);
         MasterServerMetadata master1 = MasterServerMetadata.builder()
                 .cpuUsage(0.2)
                 .memoryUsage(0.4)
@@ -63,10 +63,11 @@ public void setUp() {
                 .serverStatus(ServerStatus.BUSY)
                 .address("127.0.0.4:5679")
                 .build();
-        clusterManager.getMasterClusters().onServerAdded(master1);
-        clusterManager.getMasterClusters().onServerAdded(master2);
-        clusterManager.getMasterClusters().onServerAdded(master3);
-        clusterManager.getMasterClusters().onServerAdded(master4);
+        this.masterClusters.registerListener(new MasterSlotChangeListenerAdaptor(masterSlotManager, masterClusters));
+        masterClusters.onServerAdded(master1);
+        masterClusters.onServerAdded(master2);
+        masterClusters.onServerAdded(master3);
+        masterClusters.onServerAdded(master4);
     }
 
     @Test
@@ -98,8 +99,8 @@ void doReBalance() {
                 .serverStatus(ServerStatus.BUSY)
                 .address("127.0.0.4:5679")
                 .build();
-        clusterManager.getMasterClusters().onServerRemove(master2);
-        clusterManager.getMasterClusters().onServerRemove(master3);
+        masterClusters.onServerRemove(master2);
+        masterClusters.onServerRemove(master3);
         // After doReBalance, the total master slots should be 2
         assertThat(masterSlotManager.getTotalMasterSlots()).isEqualTo(2);
     }

dolphinscheduler-meter/src/main/java/org/apache/dolphinscheduler/meter/metrics/DefaultMetricsProvider.java

@@ -65,6 +65,9 @@ public SystemMetrics getSystemMetrics() {
         long totalSystemMemory = OSUtils.getTotalSystemMemory();
         long systemMemoryAvailable = OSUtils.getSystemAvailableMemoryUsed();
 
+        double diskToTalBytes = meterRegistry.get("disk.total").gauge().value();
+        double diskFreeBytes = meterRegistry.get("disk.free").gauge().value();
+
         systemMetrics = SystemMetrics.builder()
                 .systemCpuUsagePercentage(systemCpuUsage)
                 .jvmCpuUsagePercentage(processCpuUsage)
@@ -74,6 +77,9 @@ public SystemMetrics getSystemMetrics() {
                 .systemMemoryUsed(totalSystemMemory - systemMemoryAvailable)
                 .systemMemoryMax(totalSystemMemory)
                 .systemMemoryUsedPercentage((double) (totalSystemMemory - systemMemoryAvailable) / totalSystemMemory)
+                .diskUsed(diskToTalBytes - diskFreeBytes)
+                .diskTotal(diskToTalBytes)
+                .diskUsedPercentage((diskToTalBytes - diskFreeBytes) / diskToTalBytes)
                 .build();
         lastRefreshTime = System.currentTimeMillis();
         return systemMetrics;

dolphinscheduler-registry/dolphinscheduler-registry-api/src/main/java/org/apache/dolphinscheduler/registry/api/RegistryConstants.java

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.registry.api;
+
+public class RegistryConstants {
+
+    public static final String PATH_SEPARATOR = "/";
+    public static final char PATH_SEPARATOR_CHAR = '/';
+
+}