This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch renameConfig in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dbd43ada71fd58909765babf19e8a56bdc8fda60 Author: HTHou <[email protected]> AuthorDate: Sat Oct 29 23:31:16 2022 +0800 [IOTDB-4750] Refactor the configuration name --- .../resources/conf/iotdb-confignode.properties | 68 +++++----------------- .../iotdb/confignode/conf/ConfigNodeConfig.java | 16 ++--- .../confignode/conf/ConfigNodeDescriptor.java | 33 ++++++----- .../confignode/conf/ConfigNodeRemoveCheck.java | 2 +- .../confignode/conf/ConfigNodeStartupCheck.java | 2 +- .../confignode/conf/SystemPropertiesUtils.java | 24 ++++---- .../service/thrift/ConfigNodeRPCService.java | 4 +- .../confignode1conf/iotdb-confignode.properties | 14 ++--- .../confignode2conf/iotdb-confignode.properties | 14 ++--- .../confignode3conf/iotdb-confignode.properties | 14 ++--- .../org/apache/iotdb/it/env/ConfigNodeWrapper.java | 10 ++-- .../org/apache/iotdb/it/env/DataNodeWrapper.java | 16 ++--- .../apache/iotdb/integration/env/ClusterNode.java | 2 +- .../resources/conf/iotdb-common.properties | 35 ++++++++++- .../iotdb/commons/client/ClientPoolFactory.java | 24 ++++---- .../apache/iotdb/commons/conf/CommonConfig.java | 18 +++--- .../iotdb/commons/conf/CommonDescriptor.java | 18 +++--- .../apache/iotdb/commons/conf/IoTDBConstant.java | 18 ++++-- .../resources/conf/iotdb-datanode.properties | 38 ++++++------ .../apache/iotdb/db/client/ConfigNodeClient.java | 2 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 33 ++++++----- .../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 14 ++--- .../datanode1conf/iotdb-datanode.properties | 2 +- .../datanode2conf/iotdb-datanode.properties | 2 +- .../datanode3conf/iotdb-datanode.properties | 4 +- .../src/test/resources/iotdb-datanode.properties | 2 +- .../src/test/resources/iotdb-datanode.properties | 2 +- 27 files changed, 216 insertions(+), 215 deletions(-) diff --git a/confignode/src/assembly/resources/conf/iotdb-confignode.properties b/confignode/src/assembly/resources/conf/iotdb-confignode.properties index 9d7bc5d51c..17c91681b8 100644 --- a/confignode/src/assembly/resources/conf/iotdb-confignode.properties +++ b/confignode/src/assembly/resources/conf/iotdb-confignode.properties @@ -25,17 +25,17 @@ # Used for cluster internal RPC communication. # Could set 0.0.0.0, 127.0.0.1(for local test) or ipv4 address. # Datatype: String -internal_address=0.0.0.0 +cn_internal_address=0.0.0.0 # Used for cluster internal RPC communication # Datatype: int -internal_port=22277 +cn_internal_port=22277 # Used for ConfigNodeGroup's ConsensusLayer interior communication # Datatype: int -consensus_port=22278 +cn_consensus_port=22278 #################### ### Target Config Nodes @@ -49,7 +49,7 @@ consensus_port=22278 # For other ConfigNodes that are started or restarted, target_config_nodes points to any running ConfigNode's internal_address:internal_port. # Notice: The ip for any target_config_node should never be 0.0.0.0 # Datatype: String -target_config_nodes=127.0.0.1:22277 +cn_target_config_nodes=127.0.0.1:22277 #################### @@ -63,10 +63,10 @@ target_config_nodes=127.0.0.1:22277 # If it is relative, system will save the data in the relative path directory it indicates under the confignode folder. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# system_dir=data\\confignode\\system +# cn_system_dir=data\\confignode\\system # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# system_dir=data/confignode/system +# cn_system_dir=data/confignode/system # consensus dir @@ -76,48 +76,10 @@ target_config_nodes=127.0.0.1:22277 # Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data\\confignode\\consensus +# cn_consensus_dir=data\\confignode\\consensus # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data/confignode/consensus - -# UDF lib dir -# If this property is unset, system will save the data in the default relative path directory under -# the UDF folder(i.e., %CONFIGNODE_HOME%/ext/udf). -# -# If it is absolute, system will save the data in exact location it points to. -# If it is relative, system will save the data in the relative path directory it indicates under the -# UDF folder. -# Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative -# path. -# -# For Window platform -# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is -# absolute. Otherwise, it is relative. -# udf_lib_dir=ext\\udf -# -# For Linux platform -# If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# udf_lib_dir=ext/udf - -# temporary lib dir -# If this property is unset, system will save the data in the default relative path directory under -# the UDF folder(i.e., %CONFIGNODE_HOME%/ext/temporary). -# -# If it is absolute, system will save the data in exact location it points to. -# If it is relative, system will save the data in the relative path directory it indicates under the -# UDF folder. -# Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative -# path. -# -# For Window platform -# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is -# absolute. Otherwise, it is relative. -# udf_temporary_lib_dir=ext\\udf_temporary -# -# For Linux platform -# If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# udf_temporary_lib_dir=ext/udf_temporary +# cn_consensus_dir=data/confignode/consensus @@ -128,36 +90,36 @@ target_config_nodes=127.0.0.1:22277 # this feature is under development, set this as false before it is done. # Datatype: boolean -# rpc_thrift_compression_enable=false +# cn_rpc_thrift_compression_enable=false # if true, a snappy based compression method will be called before sending data by the network # Datatype: boolean # this feature is under development, set this as false before it is done. -# rpc_advanced_compression_enable=false +# cn_rpc_advanced_compression_enable=false # Datatype: int -# rpc_max_concurrent_client_num=65535 +# cn_rpc_max_concurrent_client_num=65535 # thrift max frame size, 512MB by default # Datatype: int -# thrift_max_frame_size=536870912 +# cn_thrift_max_frame_size=536870912 # thrift init buffer size # Datatype: int -# thrift_init_buffer_size=1024 +# cn_thrift_init_buffer_size=1024 # Thrift socket and connection timeout between raft nodes, in milliseconds. # Datatype: int -# connection_timeout_ms=20000 +# cn_connection_timeout_ms=20000 # selector thread (TAsyncClientManager) nums for async thread in a clientManager # Datatype: int -# selector_thread_nums_of_client_manager=1 +# cn_selector_thread_nums_of_client_manager=1 diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java index 1b84cccbc2..fd2a0f473b 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java @@ -323,35 +323,35 @@ public class ConfigNodeConfig { this.timePartitionInterval = timePartitionInterval; } - public int getRpcMaxConcurrentClientNum() { + public int getCnRpcMaxConcurrentClientNum() { return rpcMaxConcurrentClientNum; } - public void setRpcMaxConcurrentClientNum(int rpcMaxConcurrentClientNum) { + public void setCnRpcMaxConcurrentClientNum(int rpcMaxConcurrentClientNum) { this.rpcMaxConcurrentClientNum = rpcMaxConcurrentClientNum; } - public boolean isRpcAdvancedCompressionEnable() { + public boolean isCnRpcAdvancedCompressionEnable() { return rpcAdvancedCompressionEnable; } - public void setRpcAdvancedCompressionEnable(boolean rpcAdvancedCompressionEnable) { + public void setCnRpcAdvancedCompressionEnable(boolean rpcAdvancedCompressionEnable) { this.rpcAdvancedCompressionEnable = rpcAdvancedCompressionEnable; } - public int getThriftMaxFrameSize() { + public int getCnThriftMaxFrameSize() { return thriftMaxFrameSize; } - public void setThriftMaxFrameSize(int thriftMaxFrameSize) { + public void setCnThriftMaxFrameSize(int thriftMaxFrameSize) { this.thriftMaxFrameSize = thriftMaxFrameSize; } - public int getThriftDefaultBufferSize() { + public int getCnThriftDefaultBufferSize() { return thriftDefaultBufferSize; } - public void setThriftDefaultBufferSize(int thriftDefaultBufferSize) { + public void setCnThriftDefaultBufferSize(int thriftDefaultBufferSize) { this.thriftDefaultBufferSize = thriftDefaultBufferSize; } diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java index 497bbcb8d9..e98b0529c2 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java @@ -141,20 +141,20 @@ public class ConfigNodeDescriptor { private void loadProperties(Properties properties) throws BadNodeUrlException, IOException { conf.setInternalAddress( - properties.getProperty(IoTDBConstant.INTERNAL_ADDRESS, conf.getInternalAddress())); + properties.getProperty(IoTDBConstant.CN_INTERNAL_ADDRESS, conf.getInternalAddress())); conf.setInternalPort( Integer.parseInt( properties.getProperty( - IoTDBConstant.INTERNAL_PORT, String.valueOf(conf.getInternalPort())))); + IoTDBConstant.CN_INTERNAL_PORT, String.valueOf(conf.getInternalPort())))); conf.setConsensusPort( Integer.parseInt( properties.getProperty( - IoTDBConstant.CONSENSUS_PORT, String.valueOf(conf.getConsensusPort())))); + IoTDBConstant.CN_CONSENSUS_PORT, String.valueOf(conf.getConsensusPort())))); // TODO: Enable multiple target_config_nodes - String targetConfigNodes = properties.getProperty(IoTDBConstant.TARGET_CONFIG_NODES, null); + String targetConfigNodes = properties.getProperty(IoTDBConstant.CN_TARGET_CONFIG_NODES, null); if (targetConfigNodes != null) { conf.setTargetConfigNode(NodeUrlUtils.parseTEndPointUrl(targetConfigNodes)); } @@ -201,31 +201,32 @@ public class ConfigNodeDescriptor { "The configured region allocate strategy does not exist, use the default: GREEDY!"); } - conf.setRpcAdvancedCompressionEnable( + conf.setCnRpcAdvancedCompressionEnable( Boolean.parseBoolean( properties.getProperty( - "rpc_advanced_compression_enable", - String.valueOf(conf.isRpcAdvancedCompressionEnable())))); + "cn_rpc_advanced_compression_enable", + String.valueOf(conf.isCnRpcAdvancedCompressionEnable())))); - conf.setRpcMaxConcurrentClientNum( + conf.setCnRpcMaxConcurrentClientNum( Integer.parseInt( properties.getProperty( - "rpc_max_concurrent_client_num", - String.valueOf(conf.getRpcMaxConcurrentClientNum())))); + "cn_rpc_max_concurrent_client_num", + String.valueOf(conf.getCnRpcMaxConcurrentClientNum())))); - conf.setThriftDefaultBufferSize( + conf.setCnThriftDefaultBufferSize( Integer.parseInt( properties.getProperty( - "thrift_init_buffer_size", String.valueOf(conf.getThriftDefaultBufferSize())))); + "cn_thrift_init_buffer_size", + String.valueOf(conf.getCnThriftDefaultBufferSize())))); - conf.setThriftMaxFrameSize( + conf.setCnThriftMaxFrameSize( Integer.parseInt( properties.getProperty( - "thrift_max_frame_size", String.valueOf(conf.getThriftMaxFrameSize())))); + "cn_thrift_max_frame_size", String.valueOf(conf.getCnThriftMaxFrameSize())))); - conf.setSystemDir(properties.getProperty("system_dir", conf.getSystemDir())); + conf.setSystemDir(properties.getProperty("cn_system_dir", conf.getSystemDir())); - conf.setConsensusDir(properties.getProperty("consensus_dir", conf.getConsensusDir())); + conf.setConsensusDir(properties.getProperty("cn_consensus_dir", conf.getConsensusDir())); conf.setUdfLibDir(properties.getProperty("udf_lib_dir", conf.getUdfLibDir())); diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java index 45fec9d755..b3a8324647 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java @@ -130,7 +130,7 @@ public class ConfigNodeRemoveCheck { } public int getConsensusPort() { - return Integer.parseInt(systemProperties.getProperty(IoTDBConstant.CONSENSUS_PORT)); + return Integer.parseInt(systemProperties.getProperty(IoTDBConstant.CN_CONSENSUS_PORT)); } private static class ConfigNodeConfRemoveCheckHolder { diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java index 44a57cf690..006aa3043d 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java @@ -56,7 +56,7 @@ public class ConfigNodeStartupCheck { && (!CONF.getInternalAddress().equals(CONF.getTargetConfigNode().getIp()) || CONF.getInternalPort() != CONF.getTargetConfigNode().getPort())) { throw new ConfigurationException( - IoTDBConstant.TARGET_CONFIG_NODES, + IoTDBConstant.CN_TARGET_CONFIG_NODES, CONF.getTargetConfigNode().getIp() + ":" + CONF.getTargetConfigNode().getPort(), CONF.getInternalAddress() + ":" + CONF.getInternalPort()); } 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 f7edf5d9fc..4ecf22342f 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 @@ -68,31 +68,33 @@ public class SystemPropertiesUtils { boolean needReWrite = false; // Startup configuration - String internalAddress = systemProperties.getProperty("internal_address", null); + String internalAddress = systemProperties.getProperty("cn_internal_address", null); if (internalAddress == null) { needReWrite = true; } else if (!internalAddress.equals(conf.getInternalAddress())) { throw new ConfigurationException( - "internal_address", conf.getInternalAddress(), internalAddress); + "cn_internal_address", conf.getInternalAddress(), internalAddress); } - if (systemProperties.getProperty("internal_port", null) == null) { + if (systemProperties.getProperty("cn_internal_port", null) == null) { needReWrite = true; } else { - int internalPort = Integer.parseInt(systemProperties.getProperty("internal_port")); + int internalPort = Integer.parseInt(systemProperties.getProperty("cn_internal_port")); if (internalPort != conf.getInternalPort()) { throw new ConfigurationException( - "internal_port", String.valueOf(conf.getInternalPort()), String.valueOf(internalPort)); + "cn_internal_port", + String.valueOf(conf.getInternalPort()), + String.valueOf(internalPort)); } } - if (systemProperties.getProperty("consensus_port", null) == null) { + if (systemProperties.getProperty("cn_consensus_port", null) == null) { needReWrite = true; } else { - int consensusPort = Integer.parseInt(systemProperties.getProperty("consensus_port")); + int consensusPort = Integer.parseInt(systemProperties.getProperty("cn_consensus_port")); if (consensusPort != conf.getConsensusPort()) { throw new ConfigurationException( - "consensus_port", + "cn_consensus_port", String.valueOf(conf.getConsensusPort()), String.valueOf(consensusPort)); } @@ -197,9 +199,9 @@ public class SystemPropertiesUtils { systemProperties.setProperty("config_node_id", String.valueOf(conf.getConfigNodeId())); // Startup configuration - systemProperties.setProperty("internal_address", String.valueOf(conf.getInternalAddress())); - systemProperties.setProperty("internal_port", String.valueOf(conf.getInternalPort())); - systemProperties.setProperty("consensus_port", String.valueOf(conf.getConsensusPort())); + systemProperties.setProperty("cn_internal_address", String.valueOf(conf.getInternalAddress())); + systemProperties.setProperty("cn_internal_port", String.valueOf(conf.getInternalPort())); + systemProperties.setProperty("cn_consensus_port", String.valueOf(conf.getConsensusPort())); // Consensus protocol configuration systemProperties.setProperty( diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java index aeaee70f7b..e467d4b4bb 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java @@ -71,10 +71,10 @@ public class ConfigNodeRPCService extends ThriftService implements ConfigNodeRPC ThreadName.CONFIGNODE_RPC_PROCESSOR.getName(), getBindIP(), getBindPort(), - configConf.getRpcMaxConcurrentClientNum(), + configConf.getCnRpcMaxConcurrentClientNum(), configConf.getThriftServerAwaitTimeForStopService(), new ConfigNodeRPCServiceHandler(), - commonConfig.isRpcThriftCompressionEnabled()); + commonConfig.isCnRpcThriftCompressionEnabled()); } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } diff --git a/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties index bf1706fda7..f3ae20e245 100644 --- a/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties +++ b/confignode/src/test/resources/confignode1conf/iotdb-confignode.properties @@ -18,17 +18,17 @@ # under the License. # -internal_address=127.0.0.1 -internal_port=22277 -consensus_port=22278 -target_config_nodes=127.0.0.1:22277 +cn_internal_address=127.0.0.1 +cn_internal_port=22277 +cn_consensus_port=22278 +cn_target_config_nodes=127.0.0.1:22277 data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus schema_replication_factor=3 data_replication_factor=3 -system_dir=target/confignode1/system -data_dirs=target/confignode1/data -consensus_dir=target/confignode1/consensus +cn_system_dir=target/confignode1/system +cn_data_dirs=target/confignode1/data +cn_consensus_dir=target/confignode1/consensus udf_lib_dir=target/confignode1/ext/udf trigger_lib_dir=target/confignode1/ext/trigger proc_wal_dir=target/confignode1/proc diff --git a/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties index ca328db04c..7e1fe0fcbd 100644 --- a/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties +++ b/confignode/src/test/resources/confignode2conf/iotdb-confignode.properties @@ -17,17 +17,17 @@ # under the License. # -internal_address=127.0.0.1 -internal_port=22279 -consensus_port=22280 -target_config_nodes=127.0.0.1:22277 +cn_internal_address=127.0.0.1 +cn_internal_port=22279 +cn_consensus_port=22280 +cn_target_config_nodes=127.0.0.1:22277 data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus schema_replication_factor=3 data_replication_factor=3 -system_dir=target/confignode2/system -data_dirs=target/confignode2/data -consensus_dir=target/confignode2/consensus +cn_system_dir=target/confignode2/system +cn_data_dirs=target/confignode2/data +cn_consensus_dir=target/confignode2/consensus udf_lib_dir=target/confignode2/ext/udf trigger_lib_dir=target/confignode2/ext/trigger proc_wal_dir=target/confignode2/proc diff --git a/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties b/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties index 4b1f760984..50a232a29c 100644 --- a/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties +++ b/confignode/src/test/resources/confignode3conf/iotdb-confignode.properties @@ -17,17 +17,17 @@ # under the License. # -internal_address=127.0.0.1 -internal_port=22281 -consensus_port=22282 -target_config_nodes=127.0.0.1:22277 +cn_internal_address=127.0.0.1 +cn_internal_port=22281 +cn_consensus_port=22282 +cn_target_config_nodes=127.0.0.1:22277 data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus schema_replication_factor=3 data_replication_factor=3 -system_dir=target/confignode3/system -data_dirs=target/confignode3/data -consensus_dir=target/confignode3/consensus +cn_system_dir=target/confignode3/system +cn_data_dirs=target/confignode3/data +cn_consensus_dir=target/confignode3/consensus udf_lib_dir=target/confignode3/ext/udf trigger_lib_dir=target/confignode3/ext/trigger proc_wal_dir=target/confignode3/proc diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java index 6ac53766a7..5f9a454b1a 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java @@ -49,10 +49,10 @@ public class ConfigNodeWrapper extends AbstractNodeWrapper { @Override protected void updateConfig(Properties properties) { - properties.setProperty(IoTDBConstant.INTERNAL_ADDRESS, super.getIp()); - properties.setProperty(IoTDBConstant.INTERNAL_PORT, String.valueOf(getPort())); - properties.setProperty(IoTDBConstant.CONSENSUS_PORT, String.valueOf(this.consensusPort)); - properties.setProperty(IoTDBConstant.TARGET_CONFIG_NODES, this.targetConfigNodes); + properties.setProperty(IoTDBConstant.CN_INTERNAL_ADDRESS, super.getIp()); + properties.setProperty(IoTDBConstant.CN_INTERNAL_PORT, String.valueOf(getPort())); + properties.setProperty(IoTDBConstant.CN_CONSENSUS_PORT, String.valueOf(this.consensusPort)); + properties.setProperty(IoTDBConstant.CN_TARGET_CONFIG_NODES, this.targetConfigNodes); properties.setProperty( "config_node_consensus_protocol_class", "org.apache.iotdb.consensus.standalone.StandAloneConsensus"); @@ -64,7 +64,7 @@ public class ConfigNodeWrapper extends AbstractNodeWrapper { "org.apache.iotdb.consensus.standalone.StandAloneConsensus"); properties.setProperty("schema_replication_factor", "1"); properties.setProperty("data_replication_factor", "1"); - properties.setProperty("connection_timeout_ms", "30000"); + properties.setProperty("cn_connection_timeout_ms", "30000"); } @Override diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java index 5f9ede68e3..8efd6f99fc 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java @@ -49,20 +49,20 @@ public class DataNodeWrapper extends AbstractNodeWrapper { @Override protected void updateConfig(Properties properties) { - properties.setProperty(IoTDBConstant.RPC_ADDRESS, super.getIp()); - properties.setProperty(IoTDBConstant.RPC_PORT, String.valueOf(super.getPort())); - properties.setProperty(IoTDBConstant.INTERNAL_ADDRESS, this.internal_address); - properties.setProperty(IoTDBConstant.INTERNAL_PORT, String.valueOf(this.internalPort)); - properties.setProperty("mpp_data_exchange_port", String.valueOf(this.mppDataExchangePort)); + properties.setProperty(IoTDBConstant.DN_RPC_ADDRESS, super.getIp()); + properties.setProperty(IoTDBConstant.DN_RPC_PORT, String.valueOf(super.getPort())); + properties.setProperty(IoTDBConstant.DN_INTERNAL_ADDRESS, this.internal_address); + properties.setProperty(IoTDBConstant.DN_INTERNAL_PORT, String.valueOf(this.internalPort)); + properties.setProperty("dn_mpp_data_exchange_port", String.valueOf(this.mppDataExchangePort)); properties.setProperty( - "data_region_consensus_port", String.valueOf(this.dataRegionConsensusPort)); + "dn_data_region_consensus_port", String.valueOf(this.dataRegionConsensusPort)); properties.setProperty( - "schema_region_consensus_port", String.valueOf(this.schemaRegionConsensusPort)); + "dn_schema_region_consensus_port", String.valueOf(this.schemaRegionConsensusPort)); properties.setProperty("mqtt_host", super.getIp()); properties.setProperty("mqtt_port", String.valueOf(this.mqttPort)); properties.setProperty("connection_timeout_ms", "30000"); if (this.targetConfigNode != null) { - properties.setProperty(IoTDBConstant.TARGET_CONFIG_NODES, this.targetConfigNode); + properties.setProperty(IoTDBConstant.DN_TARGET_CONFIG_NODES, this.targetConfigNode); } properties.setProperty("max_tsblock_size_in_bytes", "1024"); properties.setProperty("page_size_in_byte", "1024"); diff --git a/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java b/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java index e5dae96923..1e304a756a 100644 --- a/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java +++ b/integration/src/main/java/org/apache/iotdb/integration/env/ClusterNode.java @@ -129,7 +129,7 @@ public class ClusterNode { Properties engineConfig = new Properties(); engineConfig.load(new FileInputStream(engineConfigPath)); - engineConfig.setProperty(IoTDBConstant.RPC_PORT, String.valueOf(this.rpcPort)); + engineConfig.setProperty(IoTDBConstant.DN_RPC_PORT, String.valueOf(this.rpcPort)); engineConfig.setProperty("enable_influxdb_rpc_service", Boolean.toString(false)); engineConfig.putAll(engineProperties); engineConfig.store(new FileWriter(engineConfigPath), null); diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties index d875d3eaed..46b2c9427a 100644 --- a/node-commons/src/assembly/resources/conf/iotdb-common.properties +++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties @@ -831,14 +831,43 @@ timestamp_precision=ms # The parameter form is a:b:c, where a, b, and c are integers. # udf_reader_transformer_collector_memory_proportion=1:1:1 -# Uncomment the following field to configure the udf root directory. +# UDF lib dir +# If this property is unset, system will save the data in the default relative path directory under +# the UDF folder(i.e., %CONFIGNODE_HOME%/ext/udf). +# +# If it is absolute, system will save the data in exact location it points to. +# If it is relative, system will save the data in the relative path directory it indicates under the +# UDF folder. +# Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative +# path. +# # For Window platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is # absolute. Otherwise, it is relative. -# udf_root_dir=ext\\udf +# udf_lib_dir=ext\\udf +# +# For Linux platform +# If its prefix is "/", then the path is absolute. Otherwise, it is relative. +# udf_lib_dir=ext/udf + +# temporary lib dir +# If this property is unset, system will save the data in the default relative path directory under +# the UDF folder(i.e., %CONFIGNODE_HOME%/ext/temporary). +# +# If it is absolute, system will save the data in exact location it points to. +# If it is relative, system will save the data in the relative path directory it indicates under the +# UDF folder. +# Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative +# path. +# +# For Window platform +# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is +# absolute. Otherwise, it is relative. +# udf_temporary_lib_dir=ext\\udf_temporary +# # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# udf_root_dir=ext/udf +# udf_temporary_lib_dir=ext/udf_temporary diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java b/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java index a95da8ac27..094470deb6 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java @@ -46,9 +46,9 @@ public class ClientPoolFactory { new SyncDataNodeInternalServiceClient.Factory( manager, new ClientFactoryProperty.Builder() - .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS()) - .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled()) - .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) + .setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS()) + .setRpcThriftCompressionEnabled(conf.isCnRpcThriftCompressionEnabled()) + .setSelectorNumOfAsyncClientManager(conf.getCnSelectorNumOfClientManager()) .build()), new ClientPoolProperty.Builder<SyncDataNodeInternalServiceClient>().build().getConfig()); } @@ -63,9 +63,9 @@ public class ClientPoolFactory { new AsyncDataNodeInternalServiceClient.Factory( manager, new ClientFactoryProperty.Builder() - .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS()) - .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled()) - .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) + .setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS()) + .setRpcThriftCompressionEnabled(conf.isCnRpcThriftCompressionEnabled()) + .setSelectorNumOfAsyncClientManager(conf.getCnSelectorNumOfClientManager()) .build(), ThreadName.ASYNC_DATANODE_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncDataNodeInternalServiceClient>().build().getConfig()); @@ -81,9 +81,9 @@ public class ClientPoolFactory { new AsyncConfigNodeHeartbeatServiceClient.Factory( manager, new ClientFactoryProperty.Builder() - .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS()) - .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled()) - .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) + .setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS()) + .setRpcThriftCompressionEnabled(conf.isCnRpcThriftCompressionEnabled()) + .setSelectorNumOfAsyncClientManager(conf.getCnSelectorNumOfClientManager()) .build(), ThreadName.ASYNC_CONFIGNODE_HEARTBEAT_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncConfigNodeHeartbeatServiceClient>() @@ -101,9 +101,9 @@ public class ClientPoolFactory { new AsyncDataNodeHeartbeatServiceClient.Factory( manager, new ClientFactoryProperty.Builder() - .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS()) - .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled()) - .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) + .setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS()) + .setRpcThriftCompressionEnabled(conf.isCnRpcThriftCompressionEnabled()) + .setSelectorNumOfAsyncClientManager(conf.getCnSelectorNumOfClientManager()) .build(), ThreadName.ASYNC_DATANODE_HEARTBEAT_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncDataNodeHeartbeatServiceClient>() diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java index 0c25ba4a46..86323c437e 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java @@ -105,7 +105,7 @@ public class CommonConfig { : 1; /** whether to use thrift compression. */ - private boolean isRpcThriftCompressionEnabled = false; + private boolean isCnRpcThriftCompressionEnabled = false; /** What will the system do when unrecoverable error occurs. */ private HandleSystemErrorStrategy handleSystemErrorStrategy = @@ -246,28 +246,28 @@ public class CommonConfig { this.defaultTTL = defaultTTL; } - public int getConnectionTimeoutInMS() { + public int getCnConnectionTimeoutInMS() { return connectionTimeoutInMS; } - public void setConnectionTimeoutInMS(int connectionTimeoutInMS) { + public void setCnConnectionTimeoutInMS(int connectionTimeoutInMS) { this.connectionTimeoutInMS = connectionTimeoutInMS; } - public int getSelectorNumOfClientManager() { + public int getCnSelectorNumOfClientManager() { return selectorNumOfClientManager; } - public void setSelectorNumOfClientManager(int selectorNumOfClientManager) { + public void setCnSelectorNumOfClientManager(int selectorNumOfClientManager) { this.selectorNumOfClientManager = selectorNumOfClientManager; } - public boolean isRpcThriftCompressionEnabled() { - return isRpcThriftCompressionEnabled; + public boolean isCnRpcThriftCompressionEnabled() { + return isCnRpcThriftCompressionEnabled; } - public void setRpcThriftCompressionEnabled(boolean rpcThriftCompressionEnabled) { - isRpcThriftCompressionEnabled = rpcThriftCompressionEnabled; + public void setCnRpcThriftCompressionEnabled(boolean cnRpcThriftCompressionEnabled) { + isCnRpcThriftCompressionEnabled = cnRpcThriftCompressionEnabled; } HandleSystemErrorStrategy getHandleSystemErrorStrategy() { diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java index a803010c4f..67298d151b 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java @@ -82,24 +82,24 @@ public class CommonDescriptor { properties.getProperty("default_ttl", String.valueOf(config.getDefaultTTL())))); config.setSyncFolder(properties.getProperty("sync_dir", config.getSyncFolder())); - config.setWalDirs(properties.getProperty("wal_dirs", config.getWalDirs()[0]).split(",")); + config.setWalDirs(properties.getProperty("dn_wal_dirs", config.getWalDirs()[0]).split(",")); - config.setRpcThriftCompressionEnabled( + config.setCnRpcThriftCompressionEnabled( Boolean.parseBoolean( properties.getProperty( - "rpc_thrift_compression_enable", - String.valueOf(config.isRpcThriftCompressionEnabled())))); + "cn_rpc_thrift_compression_enable", + String.valueOf(config.isCnRpcThriftCompressionEnabled())))); - config.setConnectionTimeoutInMS( + config.setCnConnectionTimeoutInMS( Integer.parseInt( properties.getProperty( - "connection_timeout_ms", String.valueOf(config.getConnectionTimeoutInMS())))); + "cn_connection_timeout_ms", String.valueOf(config.getCnConnectionTimeoutInMS())))); - config.setSelectorNumOfClientManager( + config.setCnSelectorNumOfClientManager( Integer.parseInt( properties.getProperty( - "selector_thread_nums_of_client_manager", - String.valueOf(config.getSelectorNumOfClientManager())))); + "cn_selector_thread_nums_of_client_manager", + String.valueOf(config.getCnSelectorNumOfClientManager())))); config.setHandleSystemErrorStrategy( HandleSystemErrorStrategy.valueOf( diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java index ff27133d88..624231df5f 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java @@ -50,12 +50,18 @@ public class IoTDBConstant { public static final String IOTDB_CONF = "IOTDB_CONF"; public static final String GLOBAL_DB_NAME = "IoTDB"; - public static final String RPC_ADDRESS = "rpc_address"; - public static final String RPC_PORT = "rpc_port"; - public static final String INTERNAL_ADDRESS = "internal_address"; - public static final String INTERNAL_PORT = "internal_port"; - public static final String CONSENSUS_PORT = "consensus_port"; - public static final String TARGET_CONFIG_NODES = "target_config_nodes"; + public static final String DN_RPC_ADDRESS = "dn_rpc_address"; + public static final String DN_RPC_PORT = "dn_rpc_port"; + + public static final String CN_INTERNAL_ADDRESS = "cn_internal_address"; + public static final String DN_INTERNAL_ADDRESS = "dn_internal_address"; + + public static final String CN_INTERNAL_PORT = "cn_internal_port"; + public static final String DN_INTERNAL_PORT = "dn_internal_port"; + public static final String CN_CONSENSUS_PORT = "cn_consensus_port"; + + public static final String CN_TARGET_CONFIG_NODES = "cn_target_config_nodes"; + public static final String DN_TARGET_CONFIG_NODES = "dn_target_config_nodes"; // when running the program in IDE, we can not get the version info using // getImplementationVersion() diff --git a/server/src/assembly/resources/conf/iotdb-datanode.properties b/server/src/assembly/resources/conf/iotdb-datanode.properties index 4124493be5..20b8e6aa8e 100644 --- a/server/src/assembly/resources/conf/iotdb-datanode.properties +++ b/server/src/assembly/resources/conf/iotdb-datanode.properties @@ -24,30 +24,30 @@ # could set 0.0.0.0, 127.0.0.1(for local test) or ipv4 address # if enable redirection in session, rpc_address should be the ip which session can connect. # Datatype: String -rpc_address=0.0.0.0 +dn_rpc_address=0.0.0.0 # Datatype: int -rpc_port=6667 +dn_rpc_port=6667 # Datatype: int -mpp_data_exchange_port=8777 +dn_mpp_data_exchange_port=8777 # Datatype: String # used for communication between cluster nodes. # could set 0.0.0.0, 127.0.0.1(for local test) or ipv4 address. -internal_address=0.0.0.0 +dn_internal_address=0.0.0.0 # Datatype: int # port for coordinator's communication between cluster nodes. -internal_port=9003 +dn_internal_port=9003 # Datatype: int # port for consensus's communication for data region between cluster nodes. -data_region_consensus_port=40010 +dn_data_region_consensus_port=40010 # Datatype: int # port for consensus's communication for schema region between cluster nodes. -schema_region_consensus_port=50010 +dn_schema_region_consensus_port=50010 #################### ### Target Config Nodes @@ -61,7 +61,7 @@ schema_region_consensus_port=50010 # config nodes and store them in memory. # Datatype: String # Notice: The ip for any target_config_node should never be 0.0.0.0 -target_config_nodes=127.0.0.1:22277 +dn_target_config_nodes=127.0.0.1:22277 #################### @@ -74,10 +74,10 @@ target_config_nodes=127.0.0.1:22277 # If it is relative, system will save the data in the relative path directory it indicates under the IoTDB folder. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# system_dir=data\\datanode\\system +# dn_system_dir=data\\datanode\\system # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# system_dir=data/datanode/system +# dn_system_dir=data/datanode/system # data dirs @@ -88,10 +88,10 @@ target_config_nodes=127.0.0.1:22277 # Note: If data_dirs is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# data_dirs=data\\datanode\\data +# dn_data_dirs=data\\datanode\\data # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# data_dirs=data/datanode/data +# dn_data_dirs=data/datanode/data # multi_dir_strategy @@ -105,7 +105,7 @@ target_config_nodes=127.0.0.1:22277 # Set SequenceStrategy,MaxDiskUsableSpaceFirstStrategy and MinFolderOccupiedSpaceFirstStrategy to apply the corresponding strategy. # If this property is unset, system will use MaxDiskUsableSpaceFirstStrategy as default strategy. # For this property, fully-qualified class name (include package name) and simple class name are both acceptable. -# multi_dir_strategy=MaxDiskUsableSpaceFirstStrategy +# dn_multi_dir_strategy=MaxDiskUsableSpaceFirstStrategy # consensus dir # If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/datanode). @@ -114,10 +114,10 @@ target_config_nodes=127.0.0.1:22277 # Note: If consensus_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data\\datanode\\consensus +# dn_consensus_dir=data\\datanode\\consensus # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data/datanode/consensus +# dn_consensus_dir=data/datanode/consensus # wal dirs # If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/datanode). @@ -127,15 +127,15 @@ target_config_nodes=127.0.0.1:22277 # Note: If wal_dirs is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# wal_dirs=data\\datanode\\wal +# dn_wal_dirs=data\\datanode\\wal # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# wal_dirs=data/datanode/wal +# dn_wal_dirs=data/datanode/wal # tracing dir # Uncomment following fields to configure the tracing root directory. # For Window platform, the index is as follows: -# tracing_dir=datanode\\tracing +# dn_tracing_dir=datanode\\tracing # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# tracing_dir=datanode/tracing +# dn_tracing_dir=datanode/tracing diff --git a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java index 9399df5170..0872ca7586 100644 --- a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java +++ b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java @@ -158,7 +158,7 @@ public class ConfigNodeClient // Read config nodes from configuration configNodes = ConfigNodeInfo.getInstance().getLatestConfigNodes(); protocolFactory = - CommonDescriptor.getInstance().getConfig().isRpcThriftCompressionEnabled() + CommonDescriptor.getInstance().getConfig().isCnRpcThriftCompressionEnabled() ? new TCompactProtocol.Factory() : new TBinaryProtocol.Factory(); 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 616d4a7ce2..3793c7df28 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 @@ -195,7 +195,7 @@ public class IoTDBDescriptor { public void loadProperties(Properties properties) { - conf.setRpcAddress(properties.getProperty(IoTDBConstant.RPC_ADDRESS, conf.getRpcAddress())); + conf.setRpcAddress(properties.getProperty(IoTDBConstant.DN_RPC_ADDRESS, conf.getRpcAddress())); // TODO: Use FQDN to identify our nodes afterwards try { @@ -241,7 +241,8 @@ public class IoTDBDescriptor { conf.setRpcPort( Integer.parseInt( - properties.getProperty(IoTDBConstant.RPC_PORT, Integer.toString(conf.getRpcPort())))); + properties.getProperty( + IoTDBConstant.DN_RPC_PORT, Integer.toString(conf.getRpcPort())))); conf.setEnableInfluxDBRpcService( Boolean.parseBoolean( @@ -288,7 +289,7 @@ public class IoTDBDescriptor { loadWALProps(properties); - String systemDir = properties.getProperty("system_dir"); + String systemDir = properties.getProperty("dn_system_dir"); if (systemDir == null) { systemDir = properties.getProperty("base_dir"); if (systemDir != null) { @@ -305,11 +306,11 @@ public class IoTDBDescriptor { conf.setQueryDir( FilePathUtils.regularizePath(conf.getSystemDir() + IoTDBConstant.QUERY_FOLDER_NAME)); - conf.setTracingDir(properties.getProperty("tracing_dir", conf.getTracingDir())); + conf.setTracingDir(properties.getProperty("dn_tracing_dir", conf.getTracingDir())); - conf.setDataDirs(properties.getProperty("data_dirs", conf.getDataDirs()[0]).split(",")); + conf.setDataDirs(properties.getProperty("dn_data_dirs", conf.getDataDirs()[0]).split(",")); - conf.setConsensusDir(properties.getProperty("consensus_dir", conf.getConsensusDir())); + conf.setConsensusDir(properties.getProperty("dn_consensus_dir", conf.getConsensusDir())); int mlogBufferSize = Integer.parseInt( @@ -328,7 +329,7 @@ public class IoTDBDescriptor { String oldMultiDirStrategyClassName = conf.getMultiDirStrategyClassName(); conf.setMultiDirStrategyClassName( - properties.getProperty("multi_dir_strategy", conf.getMultiDirStrategyClassName())); + properties.getProperty("dn_multi_dir_strategy", conf.getMultiDirStrategyClassName())); try { conf.checkMultiDirStrategyClassName(); } catch (Exception e) { @@ -1402,13 +1403,13 @@ public class IoTDBDescriptor { public void loadHotModifiedProps(Properties properties) throws QueryProcessException { try { // update data dirs - String dataDirs = properties.getProperty("data_dirs", null); + String dataDirs = properties.getProperty("dn_data_dirs", null); if (dataDirs != null) { conf.reloadDataDirs(dataDirs.split(",")); } // update dir strategy, must update after data dirs - String multiDirStrategyClassName = properties.getProperty("multi_dir_strategy", null); + String multiDirStrategyClassName = properties.getProperty("dn_multi_dir_strategy", null); if (multiDirStrategyClassName != null && !multiDirStrategyClassName.equals(conf.getMultiDirStrategyClassName())) { conf.setMultiDirStrategyClassName(multiDirStrategyClassName); @@ -1710,7 +1711,7 @@ public class IoTDBDescriptor { Integer.parseInt(initialByteArrayLengthForMemoryControl)); } - conf.setUdfDir(properties.getProperty("udf_root_dir", conf.getUdfDir())); + conf.setUdfDir(properties.getProperty("udf_lib_dir", conf.getUdfDir())); String memoryBudgetInMb = properties.getProperty("udf_memory_budget_in_mb"); if (memoryBudgetInMb != null) { @@ -1829,7 +1830,7 @@ public class IoTDBDescriptor { } public void loadClusterProps(Properties properties) { - String configNodeUrls = properties.getProperty(IoTDBConstant.TARGET_CONFIG_NODES); + String configNodeUrls = properties.getProperty(IoTDBConstant.DN_TARGET_CONFIG_NODES); if (configNodeUrls != null) { try { conf.setTargetConfigNodeList(NodeUrlUtils.parseTEndPointUrls(configNodeUrls)); @@ -1840,23 +1841,23 @@ public class IoTDBDescriptor { } conf.setInternalAddress( - properties.getProperty(IoTDBConstant.INTERNAL_ADDRESS, conf.getInternalAddress())); + properties.getProperty(IoTDBConstant.DN_INTERNAL_ADDRESS, conf.getInternalAddress())); conf.setInternalPort( Integer.parseInt( properties.getProperty( - IoTDBConstant.INTERNAL_PORT, Integer.toString(conf.getInternalPort())))); + IoTDBConstant.DN_INTERNAL_PORT, Integer.toString(conf.getInternalPort())))); conf.setDataRegionConsensusPort( Integer.parseInt( properties.getProperty( - "data_region_consensus_port", + "dn_data_region_consensus_port", Integer.toString(conf.getDataRegionConsensusPort())))); conf.setSchemaRegionConsensusPort( Integer.parseInt( properties.getProperty( - "schema_region_consensus_port", + "dn_schema_region_consensus_port", Integer.toString(conf.getSchemaRegionConsensusPort())))); } @@ -1864,7 +1865,7 @@ public class IoTDBDescriptor { conf.setMppDataExchangePort( Integer.parseInt( properties.getProperty( - "mpp_data_exchange_port", Integer.toString(conf.getMppDataExchangePort())))); + "dn_mpp_data_exchange_port", Integer.toString(conf.getMppDataExchangePort())))); conf.setMppDataExchangeCorePoolSize( Integer.parseInt( properties.getProperty( diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java index 3f7a63689b..7d2ba83f70 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java @@ -120,26 +120,26 @@ public class IoTDBStartCheck { private static final String IOTDB_VERSION_STRING = "iotdb_version"; - private static final String INTERNAL_ADDRESS = "internal_address"; + private static final String INTERNAL_ADDRESS = "dn_internal_address"; private static final String internalAddress = config.getInternalAddress(); - private static final String INTERNAL_PORT = "internal_port"; + private static final String INTERNAL_PORT = "dn_internal_port"; private static final String internalPort = String.valueOf(config.getInternalPort()); - private static final String RPC_ADDRESS = "rpc_address"; + private static final String RPC_ADDRESS = "dn_rpc_address"; private static final String rpcAddress = config.getRpcAddress(); - private static final String RPC_PORT = "rpc_port"; + private static final String RPC_PORT = "dn_rpc_port"; private static final String rpcPort = String.valueOf(config.getRpcPort()); - private static final String MPP_DATA_EXCHANGE_PORT = "mpp_data_exchange_port"; + private static final String MPP_DATA_EXCHANGE_PORT = "dn_mpp_data_exchange_port"; private static final String mppDataExchangePort = String.valueOf(config.getMppDataExchangePort()); - private static final String SCHEMA_REGION_CONSENSUS_PORT = "schema_region_consensus_port"; + private static final String SCHEMA_REGION_CONSENSUS_PORT = "dn_schema_region_consensus_port"; private static final String schemaRegionConsensusPort = String.valueOf(config.getSchemaRegionConsensusPort()); - private static final String DATA_REGION_CONSENSUS_PORT = "data_region_consensus_port"; + private static final String DATA_REGION_CONSENSUS_PORT = "dn_data_region_consensus_port"; private static final String dataRegionConsensusPort = String.valueOf(config.getDataRegionConsensusPort()); diff --git a/server/src/test/resources/datanode1conf/iotdb-datanode.properties b/server/src/test/resources/datanode1conf/iotdb-datanode.properties index f26d613df6..be40726076 100644 --- a/server/src/test/resources/datanode1conf/iotdb-datanode.properties +++ b/server/src/test/resources/datanode1conf/iotdb-datanode.properties @@ -32,7 +32,7 @@ system_dir=target/datanode1/system data_dirs=target/datanode1/data wal_dirs=target/datanode1/wal index_root_dir=target/datanode1/data/index -udf_root_dir=target/datanode1/ext/udf +udf_lib_dir=target/datanode1/ext/udf tracing_dir=target/datanode1/data/tracing consensus_dir=target/datanode1/consensus trigger_root_dir=target/datanode1/ext/trigger diff --git a/server/src/test/resources/datanode2conf/iotdb-datanode.properties b/server/src/test/resources/datanode2conf/iotdb-datanode.properties index 927da3237f..0c6c669b89 100644 --- a/server/src/test/resources/datanode2conf/iotdb-datanode.properties +++ b/server/src/test/resources/datanode2conf/iotdb-datanode.properties @@ -32,7 +32,7 @@ system_dir=target/datanode2/system data_dirs=target/datanode2/data wal_dirs=target/datanode2/wal index_root_dir=target/datanode2/data/index -udf_root_dir=target/datanode2/ext/udf +udf_lib_dir=target/datanode2/ext/udf tracing_dir=target/datanode2/data/tracing consensus_dir=target/datanode2/consensus trigger_root_dir=target/datanode2/ext/trigger diff --git a/server/src/test/resources/datanode3conf/iotdb-datanode.properties b/server/src/test/resources/datanode3conf/iotdb-datanode.properties index 37578f269c..886f6f9106 100644 --- a/server/src/test/resources/datanode3conf/iotdb-datanode.properties +++ b/server/src/test/resources/datanode3conf/iotdb-datanode.properties @@ -30,9 +30,9 @@ target_config_nodes=127.0.0.1:22277,127.0.0.1:22279,127.0.0.1:22281 system_dir=target/datanode3/system data_dirs=target/datanode3/data -wal_dirs=target/datanode3/wal +wal_dir=target/datanode3/wal index_root_dir=target/datanode3/data/index -udf_root_dir=target/datanode3/ext +udf_lib_dir=target/datanode3/ext tracing_dir=target/datanode3/data/tracing consensus_dir=target/datanode3/consensus trigger_root_dir=target/datanode3/ext/trigger diff --git a/server/src/test/resources/iotdb-datanode.properties b/server/src/test/resources/iotdb-datanode.properties index cc2f8613fa..5796cb51ec 100644 --- a/server/src/test/resources/iotdb-datanode.properties +++ b/server/src/test/resources/iotdb-datanode.properties @@ -21,7 +21,7 @@ base_dir=target/tmp data_dirs=target/data wal_dirs=target/wal index_root_dir=target/index -udf_root_dir=target/ext/udf +udf_lib_dir=target/ext/udf trigger_root_dir=target/ext/trigger tracing_dir=target/data/tracing minimum_schema_file_segment_in_bytes=0 diff --git a/testcontainer/src/test/resources/iotdb-datanode.properties b/testcontainer/src/test/resources/iotdb-datanode.properties index bb967c419c..ed9f096aab 100644 --- a/testcontainer/src/test/resources/iotdb-datanode.properties +++ b/testcontainer/src/test/resources/iotdb-datanode.properties @@ -20,5 +20,5 @@ base_dir=target/tmp data_dirs=target/data wal_dirs=target/wal index_root_dir=target/index -udf_root_dir=target/ext +udf_lib_dir=target/ext tracing_dir=target/data/tracing \ No newline at end of file
