From 7e280f739aa8eb4616ef26d36636c40321138e69 Mon Sep 17 00:00:00 2001 From: suchenglong <404083629@qq.com> Date: Thu, 13 Aug 2026 17:55:50 +0800 Subject: [PATCH 1/2] support streamnode --- .../config/MetricConfigDescriptor.java | 74 +++++++++++-------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java index def3d1e50c05..85e9a89c1458 100644 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java @@ -33,13 +33,24 @@ public class MetricConfigDescriptor { /** The metric config of metric service. */ private static final MetricConfig metricConfig = new MetricConfig(); + private static final String CONFIG_NODE_PREFIX = "cn_"; + private static final String DATA_NODE_PREFIX = "dn_"; + private MetricConfigDescriptor() { // empty constructor } /** Load properties into metric config. */ public void loadProps(Properties properties, boolean isConfigNode) { - MetricConfig loadConfig = generateFromProperties(properties, isConfigNode); + loadProps(properties, isConfigNode ? CONFIG_NODE_PREFIX : DATA_NODE_PREFIX); + } + + /** + * Load properties into metric config with a node-specific prefix (e.g. {@code "cn_"}, {@code + * "dn_"}, {@code "sn_"}). + */ + public void loadProps(Properties properties, String prefix) { + MetricConfig loadConfig = generateFromProperties(properties, prefix); metricConfig.copy(loadConfig); } @@ -49,7 +60,16 @@ public void loadProps(Properties properties, boolean isConfigNode) { * @return reload level of metric service */ public ReloadLevel loadHotProps(Properties properties, boolean isConfigNode) { - MetricConfig newMetricConfig = generateFromProperties(properties, isConfigNode); + return loadHotProps(properties, isConfigNode ? CONFIG_NODE_PREFIX : DATA_NODE_PREFIX); + } + + /** + * Load properties into metric config when reload service with a node-specific prefix. + * + * @return reload level of metric service + */ + public ReloadLevel loadHotProps(Properties properties, String prefix) { + MetricConfig newMetricConfig = generateFromProperties(properties, prefix); ReloadLevel reloadLevel = ReloadLevel.NOTHING; if (!metricConfig.equals(newMetricConfig)) { if (!metricConfig.getMetricLevel().equals(newMetricConfig.getMetricLevel()) @@ -73,7 +93,7 @@ public ReloadLevel loadHotProps(Properties properties, boolean isConfigNode) { } /** Load properties into metric config. */ - private MetricConfig generateFromProperties(Properties properties, boolean isConfigNode) { + private MetricConfig generateFromProperties(Properties properties, String prefix) { MetricConfig loadConfig = new MetricConfig(); String reporterList = @@ -85,16 +105,13 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon .map(ReporterType::toString) .collect(Collectors.toSet())), properties, - isConfigNode); + prefix); loadConfig.setMetricReporterList(reporterList); loadConfig.setMetricLevel( MetricLevel.valueOf( getProperty( - "metric_level", - String.valueOf(loadConfig.getMetricLevel()), - properties, - isConfigNode))); + "metric_level", String.valueOf(loadConfig.getMetricLevel()), properties, prefix))); loadConfig.setAsyncCollectPeriodInSecond( Integer.parseInt( @@ -102,7 +119,7 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon "metric_async_collect_period", String.valueOf(loadConfig.getAsyncCollectPeriodInSecond()), properties, - isConfigNode))); + prefix))); loadConfig.setPrometheusReporterPort( Integer.parseInt( @@ -110,7 +127,7 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon "metric_prometheus_reporter_port", String.valueOf(loadConfig.getPrometheusReporterPort()), properties, - isConfigNode))); + prefix))); loadConfig.setPrometheusReporterUsername( getPropertyWithoutPrefix( @@ -139,8 +156,7 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon IoTDBReporterConfig reporterConfig = loadConfig.getIoTDBReporterConfig(); reporterConfig.setHost( - getProperty( - "metric_iotdb_reporter_host", reporterConfig.getHost(), properties, isConfigNode)); + getProperty("metric_iotdb_reporter_host", reporterConfig.getHost(), properties, prefix)); reporterConfig.setPort( Integer.valueOf( @@ -148,21 +164,15 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon "metric_iotdb_reporter_port", String.valueOf(reporterConfig.getPort()), properties, - isConfigNode))); + prefix))); reporterConfig.setUsername( getProperty( - "metric_iotdb_reporter_username", - reporterConfig.getUsername(), - properties, - isConfigNode)); + "metric_iotdb_reporter_username", reporterConfig.getUsername(), properties, prefix)); reporterConfig.setPassword( getProperty( - "metric_iotdb_reporter_password", - reporterConfig.getPassword(), - properties, - isConfigNode)); + "metric_iotdb_reporter_password", reporterConfig.getPassword(), properties, prefix)); reporterConfig.setMaxConnectionNumber( Integer.valueOf( @@ -170,14 +180,11 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon "metric_iotdb_reporter_max_connection_number", String.valueOf(reporterConfig.getMaxConnectionNumber()), properties, - isConfigNode))); + prefix))); reporterConfig.setLocation( getProperty( - "metric_iotdb_reporter_location", - reporterConfig.getLocation(), - properties, - isConfigNode)); + "metric_iotdb_reporter_location", reporterConfig.getLocation(), properties, prefix)); reporterConfig.setPushPeriodInSecond( Integer.valueOf( @@ -185,8 +192,10 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon "metric_iotdb_reporter_push_period", String.valueOf(reporterConfig.getPushPeriodInSecond()), properties, - isConfigNode))); - if (!isConfigNode) { + prefix))); + // Internal reporter writes metrics into IoTDB internal tables, which only DataNode + // (prefix "dn_") has storage to host. ConfigNode and StreamNode skip this config. + if (DATA_NODE_PREFIX.equals(prefix)) { loadConfig.setInternalReportType( InternalReporterType.valueOf( properties.getProperty( @@ -197,11 +206,12 @@ private MetricConfig generateFromProperties(Properties properties, boolean isCon return loadConfig; } - /** Get property from confignode or datanode. */ + /** + * Get property with a node-specific prefix (e.g. {@code "cn_"}, {@code "dn_"}, {@code "sn_"}). + */ private String getProperty( - String target, String defaultValue, Properties properties, boolean isConfigNode) { - return Optional.ofNullable( - properties.getProperty((isConfigNode ? "cn_" : "dn_") + target, defaultValue)) + String target, String defaultValue, Properties properties, String prefix) { + return Optional.ofNullable(properties.getProperty(prefix + target, defaultValue)) .map(String::trim) .orElse(defaultValue); } From a3d3961352a31d9426e238fdbfeb0e8dfddd8365 Mon Sep 17 00:00:00 2001 From: suchenglong <404083629@qq.com> Date: Fri, 14 Aug 2026 08:38:25 +0800 Subject: [PATCH 2/2] remove unnecessary comments --- .../apache/iotdb/metrics/config/MetricConfigDescriptor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java index 85e9a89c1458..0d83d3874097 100644 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java @@ -193,8 +193,7 @@ private MetricConfig generateFromProperties(Properties properties, String prefix String.valueOf(reporterConfig.getPushPeriodInSecond()), properties, prefix))); - // Internal reporter writes metrics into IoTDB internal tables, which only DataNode - // (prefix "dn_") has storage to host. ConfigNode and StreamNode skip this config. + if (DATA_NODE_PREFIX.equals(prefix)) { loadConfig.setInternalReportType( InternalReporterType.valueOf(