Use the correct value in showConfiguration to override the value read from the configuration file (apache#16681)

Author: shuwenwei

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java

@@ -22,6 +22,7 @@
 import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
 import org.apache.iotdb.commons.conf.CommonConfig;
 import org.apache.iotdb.commons.conf.CommonDescriptor;
+import org.apache.iotdb.commons.conf.ConfigurationFileUtils;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.commons.exception.BadNodeUrlException;
 import org.apache.iotdb.commons.file.SystemPropertiesHandler;
@@ -87,6 +88,7 @@ public static boolean isRestarted() {
    */
   public static void checkSystemProperties() throws IOException {
     Properties systemProperties = systemPropertiesHandler.read();
+    ConfigurationFileUtils.updateAppliedProperties(systemProperties, false);
     final String format =
         "[SystemProperties] The parameter \"{}\" can't be modified after first startup."
             + " Your configuration: {} will be forced update to: {}";

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java

@@ -415,4 +415,8 @@ public void checkEncryptMagicString() throws IOException, ConfigurationException
       }
     }
   }
+
+  public Properties getProperties() {
+    return properties;
+  }
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java

@@ -35,6 +35,7 @@
 import org.apache.iotdb.commons.client.exception.ClientManagerException;
 import org.apache.iotdb.commons.concurrent.IoTDBDefaultThreadExceptionHandler;
 import org.apache.iotdb.commons.conf.CommonDescriptor;
+import org.apache.iotdb.commons.conf.ConfigurationFileUtils;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.commons.consensus.ConsensusGroupId;
 import org.apache.iotdb.commons.consensus.DataRegionId;
@@ -270,6 +271,8 @@ protected void start() {
 
       // Serialize mutable system properties
       IoTDBStartCheck.getInstance().serializeMutableSystemPropertiesIfNecessary();
+      ConfigurationFileUtils.updateAppliedProperties(
+          IoTDBStartCheck.getInstance().getProperties(), false);
 
       logger.info("IoTDB configuration: {}", config.getConfigMessage());
       logger.info("Congratulations, IoTDB DataNode is set up successfully. Now, enjoy yourself!");
@@ -439,6 +442,7 @@ private void pullAndCheckSystemConfigurations() throws StartupException {
       throw new StartupException(e.getMessage());
     }
 
+    ConfigurationFileUtils.updateAppliedPropertiesFromCN(configurationResp);
     // init
     initTimestampPrecision();
     long endTime = System.currentTimeMillis();

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/ConfigurationFileUtils.java

@@ -20,6 +20,7 @@
 package org.apache.iotdb.commons.conf;
 
 import org.apache.iotdb.commons.auth.entity.PrivilegeType;
+import org.apache.iotdb.confignode.rpc.thrift.TSystemConfigurationResp;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,7 +92,7 @@ public class ConfigurationFileUtils {
     hidedParameters.add("trust_store_pwd");
   }
 
-  public static void updateAppliedProperties(TrimProperties properties, boolean isHotReloading) {
+  public static void updateAppliedProperties(Properties properties, boolean isHotReloading) {
     try {
       loadConfigurationDefaultValueFromTemplate();
     } catch (IOException e) {
@@ -114,6 +115,65 @@ public static void updateAppliedProperties(TrimProperties properties, boolean is
     }
   }
 
+  public static void updateAppliedPropertiesFromCN(TSystemConfigurationResp resp) {
+    if (resp.getGlobalConfig().isSetTimestampPrecision()) {
+      lastAppliedProperties.put(
+          "timestamp_precision", resp.getGlobalConfig().getTimestampPrecision());
+    }
+    if (resp.getGlobalConfig().isSetTimePartitionInterval()) {
+      lastAppliedProperties.put(
+          "time_partition_interval",
+          String.valueOf(resp.getGlobalConfig().getTimePartitionInterval()));
+    }
+    if (resp.getGlobalConfig().isSetTimePartitionOrigin()) {
+      lastAppliedProperties.put(
+          "time_partition_origin", String.valueOf(resp.getGlobalConfig().getTimePartitionOrigin()));
+    }
+    if (resp.getGlobalConfig().isSetSchemaEngineMode()) {
+      lastAppliedProperties.put("schema_engine_mode", resp.getGlobalConfig().getSchemaEngineMode());
+    }
+    if (resp.getGlobalConfig().isSetTagAttributeTotalSize()) {
+      lastAppliedProperties.put(
+          "tag_attribute_total_size",
+          String.valueOf(resp.getGlobalConfig().getTagAttributeTotalSize()));
+    }
+    if (resp.getGlobalConfig().isSetSeriesPartitionExecutorClass()) {
+      lastAppliedProperties.put(
+          "series_partition_executor_class",
+          resp.getGlobalConfig().getSeriesPartitionExecutorClass());
+    }
+    if (resp.getGlobalConfig().isSetSeriesPartitionSlotNum()) {
+      lastAppliedProperties.put(
+          "series_slot_num", String.valueOf(resp.getGlobalConfig().getSeriesPartitionSlotNum()));
+    }
+    if (resp.getGlobalConfig().isSetDataRegionConsensusProtocolClass()) {
+      lastAppliedProperties.put(
+          "data_region_consensus_protocol_class",
+          resp.getGlobalConfig().getDataRegionConsensusProtocolClass());
+    }
+    if (resp.getGlobalConfig().isSetSchemaRegionConsensusProtocolClass()) {
+      lastAppliedProperties.put(
+          "schema_region_consensus_protocol_class",
+          resp.getGlobalConfig().getSchemaRegionConsensusProtocolClass());
+    }
+    if (resp.getGlobalConfig().isSetReadConsistencyLevel()) {
+      lastAppliedProperties.put(
+          "read_consistency_level", resp.getGlobalConfig().getReadConsistencyLevel());
+    }
+    if (resp.getGlobalConfig().isSetDiskSpaceWarningThreshold()) {
+      lastAppliedProperties.put(
+          "disk_space_warning_threshold",
+          String.valueOf(resp.getGlobalConfig().getDiskSpaceWarningThreshold()));
+    }
+  }
+
+  // This method may not be used in the current version directly, but should not be removed to
+  // reduce conflicts
+  @SuppressWarnings("unused")
+  public static void updateAppliedProperties(String key, String value) {
+    lastAppliedProperties.put(key, value);
+  }
+
   public static Map<String, String> getAppliedProperties() {
     return lastAppliedProperties;
   }

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java

@@ -19,6 +19,7 @@
 
 package org.apache.iotdb.commons.file;
 
+import org.apache.iotdb.commons.conf.ConfigurationFileUtils;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 
 import org.apache.ratis.util.AutoCloseableLock;
@@ -80,6 +81,7 @@ public void put(Object... keyOrValue) throws IOException {
   }
 
   public void overwrite(Properties properties) throws IOException {
+    ConfigurationFileUtils.updateAppliedProperties(properties, false);
     try (AutoCloseableLock ignore = AutoCloseableLock.acquire(lock.writeLock())) {
       if (!formalFile.exists()) {
         writeWithoutLock(properties, formalFile);