This is an automated email from the ASF dual-hosted git repository.
rong 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 38e730e4cf [IOTDB-3378] Fix iotdb reporter in metric framework and
update rpc address and port when use cluster mode. (#6150)
38e730e4cf is described below
commit 38e730e4cffc5734d9a5bb07a82e5b895c28c694
Author: ZhangHongYin <[email protected]>
AuthorDate: Thu Jun 2 16:09:39 2022 +0800
[IOTDB-3378] Fix iotdb reporter in metric framework and update rpc address
and port when use cluster mode. (#6150)
* change " to `
* fix instance config.
---
.../confignode/conf/ConfigNodeDescriptor.java | 4 ++++
.../apache/iotdb/metrics/config/MetricConfig.java | 27 ++++++++++------------
.../apache/iotdb/metrics/utils/MetricsUtils.java | 16 ++++++-------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 +++
4 files changed, 27 insertions(+), 23 deletions(-)
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 36ea3f2008..515669ff19 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.confignode.conf;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.BadNodeUrlException;
import org.apache.iotdb.commons.utils.NodeUrlUtils;
+import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -239,6 +240,9 @@ public class ConfigNodeDescriptor {
commonDescriptor
.getConfig()
.updatePath(System.getProperty(ConfigNodeConstant.CONFIGNODE_HOME,
null));
+ MetricConfigDescriptor.getInstance()
+ .getMetricConfig()
+ .updateRpcInstance(conf.getRpcAddress(), conf.getRpcPort());
}
}
diff --git
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
index 3cb02fa273..f3d62ad96c 100644
---
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
+++
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
@@ -147,10 +147,10 @@ public class MetricConfig {
}
}
- /** the host of iotdb instance that is monitored */
- private String instanceHost = "127.0.0.1";
+ /** the address of iotdb instance that is monitored */
+ private String rpcAddress = "0.0.0.0";
/** the port of iotdb instance that is monitored */
- private Integer instancePort = 6667;
+ private Integer rpcPort = 6667;
public void copy(MetricConfig newMetricConfig) {
enableMetric = newMetricConfig.getEnableMetric();
@@ -162,6 +162,11 @@ public class MetricConfig {
ioTDBReporterConfig = newMetricConfig.ioTDBReporterConfig;
}
+ public void updateRpcInstance(String rpcAddress, int rpcPort) {
+ this.rpcAddress = rpcAddress;
+ this.rpcPort = rpcPort;
+ }
+
public Boolean getEnableMetric() {
return enableMetric;
}
@@ -226,20 +231,12 @@ public class MetricConfig {
this.ioTDBReporterConfig = ioTDBReporterConfig;
}
- public String getInstanceHost() {
- return instanceHost;
- }
-
- public void setInstanceHost(String instanceHost) {
- this.instanceHost = instanceHost;
- }
-
- public Integer getInstancePort() {
- return instancePort;
+ public String getRpcAddress() {
+ return rpcAddress;
}
- public void setInstancePort(Integer instancePort) {
- this.instancePort = instancePort;
+ public Integer getRpcPort() {
+ return rpcPort;
}
@Override
diff --git
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/MetricsUtils.java
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/MetricsUtils.java
index ec359191c2..505d4b8a51 100644
---
a/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/MetricsUtils.java
+++
b/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/MetricsUtils.java
@@ -33,23 +33,23 @@ public class MetricsUtils {
stringBuilder
.append("root.")
.append(metricConfig.getIoTDBReporterConfig().getDatabase())
- .append(".\"")
- .append(metricConfig.getInstanceHost())
+ .append(".`")
+ .append(metricConfig.getRpcAddress())
.append(":")
- .append(metricConfig.getInstancePort())
- .append("\"")
+ .append(metricConfig.getRpcPort())
+ .append("`")
.append(".")
- .append("\"")
+ .append("`")
.append(name)
- .append("\"");
+ .append("`");
for (Map.Entry<String, String> entry : labels.entrySet()) {
stringBuilder
.append(".")
- .append("\"")
+ .append("`")
.append(entry.getKey())
.append("=")
.append(entry.getValue())
- .append("\"");
+ .append("`");
}
return stringBuilder.toString();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 9db6ea1774..2433e1a469 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -902,6 +902,9 @@ public class IoTDBDescriptor {
// update all data seriesPath
conf.updatePath();
commonDescriptor.getConfig().updatePath(System.getProperty(IoTDBConstant.IOTDB_HOME,
null));
+ MetricConfigDescriptor.getInstance()
+ .getMetricConfig()
+ .updateRpcInstance(conf.getRpcAddress(), conf.getRpcPort());
}
}
