You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/04/25 07:47:33 UTC
[iotdb] branch master updated: [IOTDB-2999][Metric] remove useless config and fix default value error. (#5657)
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 407c076424 [IOTDB-2999][Metric] remove useless config and fix default value error. (#5657)
407c076424 is described below
commit 407c076424265fd82a7bcacb5c11665c904ce35f
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Mon Apr 25 15:47:26 2022 +0800
[IOTDB-2999][Metric] remove useless config and fix default value error. (#5657)
---
.../apache/iotdb/metrics/config/MetricConfig.java | 20 ++++++++++----------
.../iotdb/db/service/metrics/MetricsService.java | 4 +---
2 files changed, 11 insertions(+), 13 deletions(-)
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 f4c0c1f9f2..5a00a05cfe 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
@@ -51,9 +51,9 @@ public class MetricConfig {
private IoTDBReporterConfig ioTDBReporterConfig = new IoTDBReporterConfig();
public static class IoTDBReporterConfig {
- /** The host of iotdb */
+ /** The host of iotdb that store metric value */
private String host = "127.0.0.1";
- /** The port of iotdb */
+ /** The port of iotdb that store metric value */
private Integer port = 6667;
/** The username of iotdb */
private String username = "root";
@@ -145,10 +145,10 @@ public class MetricConfig {
}
}
- /** the host of Instance */
- private String InstanceHost = "127.0.0.1";
- /** the port of Instance */
- private Integer InstancePort = 8086;
+ /** the host of iotdb instance that is monitored */
+ private String instanceHost = "127.0.0.1";
+ /** the port of iotdb instance that is monitored */
+ private Integer instancePort = 6667;
public void copy(MetricConfig newMetricConfig) {
enableMetric = newMetricConfig.getEnableMetric();
@@ -217,19 +217,19 @@ public class MetricConfig {
}
public String getInstanceHost() {
- return InstanceHost;
+ return instanceHost;
}
public void setInstanceHost(String instanceHost) {
- InstanceHost = instanceHost;
+ this.instanceHost = instanceHost;
}
public Integer getInstancePort() {
- return InstancePort;
+ return instancePort;
}
public void setInstancePort(Integer instancePort) {
- InstancePort = instancePort;
+ this.instancePort = instancePort;
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java
index 46f5491cd3..294bd508c0 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.db.service.metrics;
import org.apache.iotdb.commons.conf.IoTDBConstant;
@@ -27,8 +28,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.utils.FileUtils;
import org.apache.iotdb.db.wal.node.WALNode;
import org.apache.iotdb.metrics.MetricService;
-import org.apache.iotdb.metrics.config.MetricConfig;
-import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.config.ReloadLevel;
import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -40,7 +39,6 @@ import java.util.stream.Stream;
public class MetricsService extends MetricService implements MetricsServiceMBean, IService {
private static final Logger logger = LoggerFactory.getLogger(MetricsService.class);
- private final MetricConfig metricConfig = MetricConfigDescriptor.getInstance().getMetricConfig();
private final String mbeanName =
String.format(
"%s:%s=%s", IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE, getID().getJmxName());