You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2023/02/20 12:23:36 UTC
[iotdb] branch master updated: [IOTDB-5533] Make IoTDB Internal Reporter as default
This is an automated email from the ASF dual-hosted git repository.
jackietien 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 8605ae4952 [IOTDB-5533] Make IoTDB Internal Reporter as default
8605ae4952 is described below
commit 8605ae4952a4b25e2fe9bd5d5e76e7f31d07141c
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Mon Feb 20 20:23:30 2023 +0800
[IOTDB-5533] Make IoTDB Internal Reporter as default
---
.../apache/iotdb/it/env/cluster/DataNodeWrapper.java | 1 +
.../org/apache/iotdb/metrics/config/MetricConfig.java | 2 +-
.../iotdb/metrics/config/MetricConfigDescriptor.java | 7 +------
.../org/apache/iotdb/metrics/config/ReloadLevel.java | 2 --
.../apache/iotdb/metrics/config/MetricConfigTest.java | 4 ----
.../assembly/resources/conf/iotdb-datanode.properties | 7 +------
.../java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 17 +----------------
7 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/DataNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/DataNodeWrapper.java
index f3900fdf7b..7ba28d9c8d 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/DataNodeWrapper.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/DataNodeWrapper.java
@@ -64,6 +64,7 @@ public class DataNodeWrapper extends AbstractNodeWrapper {
mutableNodeProperties.put("dn_join_cluster_retry_interval_ms", "1000");
mutableNodeProperties.put("dn_connection_timeout_ms", "30000");
+ mutableNodeProperties.put("dn_metric_internal_reporter_type", "MEMORY");
// initialize immutable properties
// Override mqtt properties of super class
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 c190c0e418..b4abb301a0 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
@@ -55,7 +55,7 @@ public class MetricConfig {
private final IoTDBReporterConfig iotdbReporterConfig = new IoTDBReporterConfig();
/** The type of internal reporter. */
- private InternalReporterType internalReporterType = InternalReporterType.MEMORY;
+ private InternalReporterType internalReporterType = InternalReporterType.IOTDB;
/** The address of iotdb instance that is monitored. */
private String rpcAddress = "0.0.0.0";
diff --git a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java
index b9153d6f07..c322a0c97f 100644
--- a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java
+++ b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java
@@ -58,11 +58,6 @@ public class MetricConfigDescriptor {
.equals(newMetricConfig.getAsyncCollectPeriodInSecond())) {
// restart metric service
reloadLevel = ReloadLevel.RESTART_METRIC;
- } else if (!metricConfig
- .getInternalReportType()
- .equals(newMetricConfig.getInternalReportType())) {
- // restart internal reporter
- reloadLevel = ReloadLevel.RESTART_INTERNAL_REPORTER;
} else {
// restart reporters
reloadLevel = ReloadLevel.RESTART_REPORTER;
@@ -143,7 +138,7 @@ public class MetricConfigDescriptor {
"metric_iotdb_reporter_push_period",
String.valueOf(reporterConfig.getPushPeriodInSecond()),
properties)));
-
+ // test only
loadConfig.setInternalReportType(
InternalReporterType.valueOf(
properties.getProperty(
diff --git a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/ReloadLevel.java b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/ReloadLevel.java
index 3d5b4e3ee9..cda300bd4e 100644
--- a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/ReloadLevel.java
+++ b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/ReloadLevel.java
@@ -22,8 +22,6 @@ package org.apache.iotdb.metrics.config;
public enum ReloadLevel {
// restart metric service
RESTART_METRIC,
- // restart internal reporter,
- RESTART_INTERNAL_REPORTER,
// restart metric service reporter
RESTART_REPORTER,
// do nothing
diff --git a/metrics/interface/src/test/java/org/apache/iotdb/metrics/config/MetricConfigTest.java b/metrics/interface/src/test/java/org/apache/iotdb/metrics/config/MetricConfigTest.java
index 76010eeaa0..25878efcc1 100644
--- a/metrics/interface/src/test/java/org/apache/iotdb/metrics/config/MetricConfigTest.java
+++ b/metrics/interface/src/test/java/org/apache/iotdb/metrics/config/MetricConfigTest.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.metrics.config;
-import org.apache.iotdb.metrics.utils.InternalReporterType;
import org.apache.iotdb.metrics.utils.MetricFrameType;
import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -66,7 +65,6 @@ public class MetricConfigTest {
assertEquals(1, (int) reporterConfig.getMaxConnectionNumber());
assertEquals("metric", reporterConfig.getLocation());
assertEquals(5, (int) reporterConfig.getPushPeriodInSecond());
- assertEquals(InternalReporterType.MEMORY, metricConfig.getInternalReportType());
}
@Test
@@ -86,7 +84,6 @@ public class MetricConfigTest {
properties.setProperty("dn_metric_iotdb_reporter_max_connection_number", "1");
properties.setProperty("dn_metric_iotdb_reporter_location", "metric");
properties.setProperty("dn_metric_iotdb_reporter_push_period", "5");
- properties.setProperty("dn_metric_internal_reporter_type", "IOTDB");
MetricConfigDescriptor.getInstance().loadProps(properties);
@@ -106,6 +103,5 @@ public class MetricConfigTest {
assertEquals(1, (int) reporterConfig.getMaxConnectionNumber());
assertEquals("metric", reporterConfig.getLocation());
assertEquals(5, (int) reporterConfig.getPushPeriodInSecond());
- assertEquals(InternalReporterType.IOTDB, metricConfig.getInternalReportType());
}
}
diff --git a/server/src/assembly/resources/conf/iotdb-datanode.properties b/server/src/assembly/resources/conf/iotdb-datanode.properties
index e23b7dfcb1..a47dfb0a2e 100644
--- a/server/src/assembly/resources/conf/iotdb-datanode.properties
+++ b/server/src/assembly/resources/conf/iotdb-datanode.properties
@@ -268,9 +268,4 @@ dn_target_config_node_list=127.0.0.1:10710
# The push period of IoTDB reporter of metric module in second
# Datatype: int
-# dn_metric_iotdb_reporter_push_period=15
-
-# The type of internal reporter in metric module
-# Options: [MEMORY, IOTDB]
-# Datatype: String
-# dn_metric_internal_reporter_type=MEMORY
\ No newline at end of file
+# dn_metric_iotdb_reporter_push_period=15
\ No newline at end of file
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 8c5b060644..b26e344b3c 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
@@ -38,7 +38,6 @@ import org.apache.iotdb.db.engine.compaction.selector.constant.InnerSequenceComp
import org.apache.iotdb.db.engine.compaction.selector.constant.InnerUnsequenceCompactionSelector;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.rescon.SystemInfo;
-import org.apache.iotdb.db.service.metrics.IoTDBInternalLocalReporter;
import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.iotdb.db.utils.datastructure.TVListSortAlgorithm;
import org.apache.iotdb.db.wal.WALManager;
@@ -46,9 +45,6 @@ import org.apache.iotdb.db.wal.utils.WALMode;
import org.apache.iotdb.external.api.IPropertiesLoader;
import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.config.ReloadLevel;
-import org.apache.iotdb.metrics.reporter.iotdb.IoTDBInternalMemoryReporter;
-import org.apache.iotdb.metrics.reporter.iotdb.IoTDBInternalReporter;
-import org.apache.iotdb.metrics.utils.InternalReporterType;
import org.apache.iotdb.rpc.RpcTransportFactory;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -1494,18 +1490,7 @@ public class IoTDBDescriptor {
}
ReloadLevel reloadLevel = MetricConfigDescriptor.getInstance().loadHotProps(commonProperties);
logger.info("Reload metric service in level {}", reloadLevel);
- if (reloadLevel == ReloadLevel.RESTART_INTERNAL_REPORTER) {
- IoTDBInternalReporter internalReporter;
- if (MetricConfigDescriptor.getInstance().getMetricConfig().getInternalReportType()
- == InternalReporterType.IOTDB) {
- internalReporter = new IoTDBInternalLocalReporter();
- } else {
- internalReporter = new IoTDBInternalMemoryReporter();
- }
- MetricService.getInstance().reloadInternalReporter(internalReporter);
- } else {
- MetricService.getInstance().reloadService(reloadLevel);
- }
+ MetricService.getInstance().reloadService(reloadLevel);
}
private void initMemoryAllocate(Properties properties) {