(iotdb) branch master updated: bind cluster name to metrics (#12786)

[tanxinyu]

This is an automated email from the ASF dual-hosted git repository.

tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new b1e9d96f49e bind cluster name to metrics (#12786)
b1e9d96f49e is described below

commit b1e9d96f49e9dfb0c34b1000b6298728d7f68415
Author: ZhangHongYin <46039728+sprico...@users.noreply.github.com>
AuthorDate: Fri Jun 21 18:14:01 2024 +0800

    bind cluster name to metrics (#12786)
---
 .../org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java    | 3 +--
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java       | 2 ++
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java   | 3 +--
 .../main/java/org/apache/iotdb/metrics/config/MetricConfig.java   | 8 ++++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 817469513e1..b04b533aaac 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -134,8 +134,7 @@ public class ConfigNodeDescriptor {
         MetricConfigDescriptor.getInstance().loadProps(commonProperties, true);
         MetricConfigDescriptor.getInstance()
             .getMetricConfig()
-            .updateRpcInstance(
-                conf.getClusterName(), NodeType.CONFIGNODE, 
SchemaConstant.SYSTEM_DATABASE);
+            .updateRpcInstance(NodeType.CONFIGNODE, 
SchemaConstant.SYSTEM_DATABASE);
       }
     } else {
       LOGGER.warn(
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 2f574d9236c..95bcc9ca148 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -41,6 +41,7 @@ import 
org.apache.iotdb.db.storageengine.dataregion.compaction.selector.constant
 import 
org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.TimeIndexLevel;
 import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALMode;
 import org.apache.iotdb.db.utils.datastructure.TVListSortAlgorithm;
+import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
 import org.apache.iotdb.metrics.metricsets.system.SystemMetrics;
 import org.apache.iotdb.rpc.BaseRpcTransportFactory;
 import org.apache.iotdb.rpc.RpcUtils;
@@ -3153,6 +3154,7 @@ public class IoTDBConfig {
 
   public void setClusterName(String clusterName) {
     this.clusterName = clusterName;
+    
MetricConfigDescriptor.getInstance().getMetricConfig().updateClusterName(clusterName);
   }
 
   public String getClusterId() {
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 3be8e0755a6..9190bc97348 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -215,8 +215,7 @@ public class IoTDBDescriptor {
         MetricConfigDescriptor.getInstance().loadProps(commonProperties, 
false);
         MetricConfigDescriptor.getInstance()
             .getMetricConfig()
-            .updateRpcInstance(
-                conf.getClusterName(), NodeType.DATANODE, 
SchemaConstant.SYSTEM_DATABASE);
+            .updateRpcInstance(NodeType.DATANODE, 
SchemaConstant.SYSTEM_DATABASE);
       }
     } else {
       LOGGER.warn(
diff --git 
a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
 
b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
index a2b1a588d71..8fa64b50d29 100644
--- 
a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
+++ 
b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
@@ -159,9 +159,13 @@ public class MetricConfig {
     return internalDatabase;
   }
 
-  /** Update rpc address and rpc port of monitored node. */
-  public void updateRpcInstance(String clusterName, NodeType nodeType, String 
internalDatabase) {
+  /** Update cluster name of monitored node. */
+  public void updateClusterName(String clusterName) {
     this.clusterName = clusterName;
+  }
+
+  /** Update rpc address and rpc port of monitored node. */
+  public void updateRpcInstance(NodeType nodeType, String internalDatabase) {
     this.nodeType = nodeType;
     this.internalDatabase = internalDatabase;
   }