You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/05/31 02:48:44 UTC
[iotdb] branch master updated: [IOTDB-5934] Let series_slot_num compatible (#9990)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu 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 d8324726279 [IOTDB-5934] Let series_slot_num compatible (#9990)
d8324726279 is described below
commit d83247262796aa23a0d5161ca5c8f2c60cf11414
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Wed May 31 10:48:38 2023 +0800
[IOTDB-5934] Let series_slot_num compatible (#9990)
---
.../confignode/conf/SystemPropertiesUtils.java | 38 ++++++++++++----------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
index 6847e7dc937..5a304fe610d 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
@@ -117,6 +117,9 @@ public class SystemPropertiesUtils {
}
}
+ final String format =
+ "[SystemProperties] The parameter \"{}\" can't be modified after first startup."
+ + " Your configuration: {} will be forced update to: {}";
// Consensus protocol configuration
String configNodeConsensusProtocolClass =
systemProperties.getProperty("config_node_consensus_protocol_class", null);
@@ -124,11 +127,12 @@ public class SystemPropertiesUtils {
needReWrite = true;
} else if (!configNodeConsensusProtocolClass.equals(
conf.getConfigNodeConsensusProtocolClass())) {
- throw new ConfigurationException(
+ LOGGER.warn(
+ format,
"config_node_consensus_protocol_class",
conf.getConfigNodeConsensusProtocolClass(),
- configNodeConsensusProtocolClass,
- "config_node_consensus_protocol_class can't be modified after first startup");
+ configNodeConsensusProtocolClass);
+ conf.setConfigNodeConsensusProtocolClass(configNodeConsensusProtocolClass);
}
String dataRegionConsensusProtocolClass =
@@ -137,11 +141,12 @@ public class SystemPropertiesUtils {
needReWrite = true;
} else if (!dataRegionConsensusProtocolClass.equals(
conf.getDataRegionConsensusProtocolClass())) {
- throw new ConfigurationException(
+ LOGGER.warn(
+ format,
"data_region_consensus_protocol_class",
conf.getDataRegionConsensusProtocolClass(),
- dataRegionConsensusProtocolClass,
- "data_region_consensus_protocol_class can't be modified after first startup");
+ dataRegionConsensusProtocolClass);
+ conf.setDataRegionConsensusProtocolClass(dataRegionConsensusProtocolClass);
}
String schemaRegionConsensusProtocolClass =
@@ -150,11 +155,12 @@ public class SystemPropertiesUtils {
needReWrite = true;
} else if (!schemaRegionConsensusProtocolClass.equals(
conf.getSchemaRegionConsensusProtocolClass())) {
- throw new ConfigurationException(
+ LOGGER.warn(
+ format,
"schema_region_consensus_protocol_class",
conf.getSchemaRegionConsensusProtocolClass(),
- schemaRegionConsensusProtocolClass,
- "schema_region_consensus_protocol_class can't be modified after first startup");
+ schemaRegionConsensusProtocolClass);
+ conf.setSchemaRegionConsensusProtocolClass(schemaRegionConsensusProtocolClass);
}
// PartitionSlot configuration
@@ -164,11 +170,8 @@ public class SystemPropertiesUtils {
int seriesPartitionSlotNum =
Integer.parseInt(systemProperties.getProperty("series_partition_slot_num"));
if (seriesPartitionSlotNum != conf.getSeriesSlotNum()) {
- throw new ConfigurationException(
- "series_partition_slot_num",
- String.valueOf(conf.getSeriesSlotNum()),
- String.valueOf(seriesPartitionSlotNum),
- "series_partition_slot_num can't be modified after first startup");
+ LOGGER.warn(format, "series_slot_num", conf.getSeriesSlotNum(), seriesPartitionSlotNum);
+ conf.setSeriesSlotNum(seriesPartitionSlotNum);
}
}
@@ -178,11 +181,12 @@ public class SystemPropertiesUtils {
needReWrite = true;
} else if (!Objects.equals(
seriesPartitionSlotExecutorClass, conf.getSeriesPartitionExecutorClass())) {
- throw new ConfigurationException(
+ LOGGER.warn(
+ format,
"series_partition_executor_class",
conf.getSeriesPartitionExecutorClass(),
- seriesPartitionSlotExecutorClass,
- "series_partition_executor_class can't be modified after first startup");
+ seriesPartitionSlotExecutorClass);
+ conf.setSeriesPartitionExecutorClass(seriesPartitionSlotExecutorClass);
}
if (needReWrite) {