Skip to content

support streamnode #18470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
suchenglong wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support streamnode #18470

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e280f7
support streamnode
suchenglong Aug 13, 2026
a3d3961
remove unnecessary comments
suchenglong Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 41 additions & 32 deletions ...trics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfigDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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())
Expand All @@ -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 =
Expand All @@ -85,32 +105,29 @@ 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(
getProperty(
"metric_async_collect_period",
String.valueOf(loadConfig.getAsyncCollectPeriodInSecond()),
properties,
isConfigNode)));
prefix)));

loadConfig.setPrometheusReporterPort(
Integer.parseInt(
getProperty(
"metric_prometheus_reporter_port",
String.valueOf(loadConfig.getPrometheusReporterPort()),
properties,
isConfigNode)));
prefix)));

loadConfig.setPrometheusReporterUsername(
getPropertyWithoutPrefix(
Expand Down Expand Up @@ -139,54 +156,45 @@ 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(
getProperty(
"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(
getProperty(
"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(
getProperty(
"metric_iotdb_reporter_push_period",
String.valueOf(reporterConfig.getPushPeriodInSecond()),
properties,
isConfigNode)));
if (!isConfigNode) {
prefix)));

if (DATA_NODE_PREFIX.equals(prefix)) {
loadConfig.setInternalReportType(
InternalReporterType.valueOf(
properties.getProperty(
Expand All @@ -197,11 +205,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);
}
Expand Down