Skip to content

Commit 9b2efea

Browse files
shuwenweiHTHou
shuwenwei
and
HTHou
authored
Merge config files to iotdb-system.properties (apache#12570)
Co-authored-by: Haonan <[email protected]>
1 parent a4a7be0 commit 9b2efea

File tree

57 files changed

+1022
-924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1022
-924
lines changed

‎.github/workflows/multi-language-client.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@ jobs:
9797
- name: Integration test
9898
shell: bash
9999
run: |
100-
cd iotdb-client/client-go/ && make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo
100+
cd iotdb-client
101+
git clone https://github.com/apache/iotdb-client-go.git
102+
cd iotdb-client-go
103+
make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo
101104
102105
python:
103106
runs-on: ubuntu-latest

‎docker/src/main/DockerCompose/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function on_stop(){
3636
trap 'on_stop' SIGTERM SIGKILL SIGQUIT
3737

3838

39-
replace-conf-from-env.sh ${start_what}
39+
replace-conf-from-env.sh
4040

4141
case "$1" in
4242
datanode)

‎docker/src/main/DockerCompose/replace-conf-from-env.sh

+1-12
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#
2020

2121
conf_path=${IOTDB_HOME}/conf
22+
target_files="iotdb-system.properties"
2223

2324
function process_single(){
2425
local key_value="$1"
@@ -48,17 +49,5 @@ function replace_configs(){
4849
done
4950
}
5051

51-
case "$1" in
52-
confignode)
53-
target_files="iotdb-common.properties iotdb-confignode.properties"
54-
;;
55-
datanode)
56-
target_files="iotdb-common.properties iotdb-datanode.properties"
57-
;;
58-
all)
59-
target_files="iotdb-common.properties iotdb-confignode.properties iotdb-datanode.properties"
60-
;;
61-
esac
62-
6352
replace_configs
6453

‎docker/src/main/Dockerfile-1c1d

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ RUN apt update \
3030
&& rm /apache-iotdb-*-bin.zip \
3131
&& mv /apache-iotdb-* /iotdb \
3232
&& mv /start-1c1d.sh /iotdb/sbin \
33-
&& sed -i 's/dn_internal_address=127.0.0.1/dn_internal_address=0.0.0.0/g' /iotdb/conf/iotdb-datanode.properties \
34-
&& sed -i 's/cn_internal_address=127.0.0.1/cn_internal_address=0.0.0.0/g' /iotdb/conf/iotdb-confignode.properties \
35-
&& sed -i 's/cn_seed_config_node=127.0.0.1:10710/cn_seed_config_node=0.0.0.0:10710/g' /iotdb/conf/iotdb-confignode.properties \
36-
&& sed -i 's/dn_seed_config_node=127.0.0.1:10710/dn_seed_config_node=0.0.0.0:10710/g' /iotdb/conf/iotdb-datanode.properties \
37-
&& sed -i 's/# config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/config_node_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
38-
&& sed -i 's/# schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/schema_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
39-
&& sed -i 's/# data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus/data_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-common.properties \
33+
&& sed -i 's/dn_internal_address=127.0.0.1/dn_internal_address=0.0.0.0/g' /iotdb/conf/iotdb-system.properties \
34+
&& sed -i 's/cn_internal_address=127.0.0.1/cn_internal_address=0.0.0.0/g' /iotdb/conf/iotdb-system.properties \
35+
&& sed -i 's/cn_seed_config_node=127.0.0.1:10710/cn_seed_config_node=0.0.0.0:10710/g' /iotdb/conf/iotdb-system.properties \
36+
&& sed -i 's/dn_seed_config_node=127.0.0.1:10710/dn_seed_config_node=0.0.0.0:10710/g' /iotdb/conf/iotdb-system.properties \
37+
&& sed -i 's/# config_node_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/config_node_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-system.properties \
38+
&& sed -i 's/# schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus/schema_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-system.properties \
39+
&& sed -i 's/# data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus/data_region_consensus_protocol_class=org.apache.iotdb.consensus.simple.SimpleConsensus/g' /iotdb/conf/iotdb-system.properties \
4040
&& apt remove unzip -y \
4141
&& apt autoremove -y \
4242
&& apt purge --auto-remove -y \

‎integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ public class ClusterConstant {
118118
public static final String CONFIG_NODE_PROPERTIES_FILE = "iotdb-confignode.properties";
119119
public static final String DATA_NODE_PROPERTIES_FILE = "iotdb-datanode.properties";
120120
public static final String COMMON_PROPERTIES_FILE = "iotdb-common.properties";
121+
public static final String IOTDB_SYSTEM_PROPERTIES_FILE = "iotdb-system.properties";
121122

122123
public static final String SYSTEM_PROPERTIES_FILE = "system.properties";
123124
public static final String CONFIG_NODE_SYSTEM_PROPERTIES_FILE = "confignode-system.properties";

‎integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppBaseConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public final void updateProperties(@Nullable String filePath) throws IOException
9797
* @throws IOException if properties storage failed.
9898
*/
9999
public final void persistent(String filePath) throws IOException {
100-
try (FileWriter confOutput = new FileWriter(filePath)) {
100+
try (FileWriter confOutput = new FileWriter(filePath, true)) {
101101
properties.store(confOutput, null);
102102
}
103103
}

‎integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ public final void changeConfig(
301301
outputNodeConfig.updateProperties(immutableNodeProperties);
302302

303303
// Persistent
304-
outputCommonConfig.persistent(getTargetCommonConfigPath());
305-
outputNodeConfig.persistent(getTargetNodeConfigPath());
304+
outputCommonConfig.persistent(getSystemConfigPath());
305+
outputNodeConfig.persistent(getSystemConfigPath());
306306
} catch (IOException ex) {
307307
throw new AssertionError("Change the config of node failed. " + ex);
308308
}
@@ -662,9 +662,7 @@ private String getKillPoints() {
662662

663663
protected abstract void renameFile();
664664

665-
protected abstract String getTargetNodeConfigPath();
666-
667-
protected abstract String getTargetCommonConfigPath();
665+
protected abstract String getSystemConfigPath();
668666

669667
/** Return the node config file path specified through system variable */
670668
protected abstract String getDefaultNodeConfigPath();

‎integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/ConfigNodeWrapper.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@
3333
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CN_CONSENSUS_DIR;
3434
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CN_METRIC_IOTDB_REPORTER_HOST;
3535
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CN_SYSTEM_DIR;
36-
import static org.apache.iotdb.it.env.cluster.ClusterConstant.COMMON_PROPERTIES_FILE;
3736
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS;
3837
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CONFIG_NODE_INIT_HEAP_SIZE;
3938
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CONFIG_NODE_MAX_DIRECT_MEMORY_SIZE;
4039
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CONFIG_NODE_MAX_HEAP_SIZE;
41-
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CONFIG_NODE_PROPERTIES_FILE;
4240
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CONFIG_NODE_SYSTEM_PROPERTIES_FILE;
4341
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATA_REGION_CONSENSUS_PROTOCOL_CLASS;
4442
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATA_REPLICATION_FACTOR;
4543
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_CONFIG_NODE_COMMON_PROPERTIES;
4644
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_CONFIG_NODE_PROPERTIES;
45+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.IOTDB_SYSTEM_PROPERTIES_FILE;
4746
import static org.apache.iotdb.it.env.cluster.ClusterConstant.SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS;
4847
import static org.apache.iotdb.it.env.cluster.ClusterConstant.SCHEMA_REPLICATION_FACTOR;
4948
import static org.apache.iotdb.it.env.cluster.ClusterConstant.TARGET;
@@ -90,13 +89,8 @@ public ConfigNodeWrapper(
9089
}
9190

9291
@Override
93-
protected String getTargetNodeConfigPath() {
94-
return workDirFilePath("conf", CONFIG_NODE_PROPERTIES_FILE);
95-
}
96-
97-
@Override
98-
protected String getTargetCommonConfigPath() {
99-
return workDirFilePath("conf", COMMON_PROPERTIES_FILE);
92+
protected String getSystemConfigPath() {
93+
return workDirFilePath("conf", IOTDB_SYSTEM_PROPERTIES_FILE);
10094
}
10195

10296
@Override

‎integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@
2929
import java.util.List;
3030

3131
import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS;
32-
import static org.apache.iotdb.it.env.cluster.ClusterConstant.COMMON_PROPERTIES_FILE;
3332
import static org.apache.iotdb.it.env.cluster.ClusterConstant.CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS;
3433
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATANODE_INIT_HEAP_SIZE;
3534
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATANODE_MAX_DIRECT_MEMORY_SIZE;
3635
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATANODE_MAX_HEAP_SIZE;
3736
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATA_NODE_NAME;
38-
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATA_NODE_PROPERTIES_FILE;
3937
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATA_REGION_CONSENSUS_PROTOCOL_CLASS;
4038
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DATA_REPLICATION_FACTOR;
4139
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DEFAULT_DATA_NODE_COMMON_PROPERTIES;
@@ -53,6 +51,7 @@
5351
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DN_SYSTEM_DIR;
5452
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DN_TRACING_DIR;
5553
import static org.apache.iotdb.it.env.cluster.ClusterConstant.DN_WAL_DIRS;
54+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.IOTDB_SYSTEM_PROPERTIES_FILE;
5655
import static org.apache.iotdb.it.env.cluster.ClusterConstant.MAIN_CLASS_NAME;
5756
import static org.apache.iotdb.it.env.cluster.ClusterConstant.MAX_TSBLOCK_SIZE_IN_BYTES;
5857
import static org.apache.iotdb.it.env.cluster.ClusterConstant.MQTT_HOST;
@@ -124,13 +123,8 @@ public DataNodeWrapper(
124123
}
125124

126125
@Override
127-
protected String getTargetNodeConfigPath() {
128-
return workDirFilePath("conf", DATA_NODE_PROPERTIES_FILE);
129-
}
130-
131-
@Override
132-
protected String getTargetCommonConfigPath() {
133-
return workDirFilePath("conf", COMMON_PROPERTIES_FILE);
126+
protected String getSystemConfigPath() {
127+
return workDirFilePath("conf", IOTDB_SYSTEM_PROPERTIES_FILE);
134128
}
135129

136130
@Override

‎iotdb-client/cli/src/assembly/resources/tools/backup.bat

+6-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ IF EXIST "%IOTDB_CONF%\datanode-env.bat" (
3838
echo Can't find datanode-env.bat
3939
)
4040

41-
IF EXIST "%IOTDB_CONF%\iotdb-datanode.properties" (
41+
IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
42+
for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_rpc_port"
43+
"%IOTDB_CONF%\iotdb-system.properties"') do (
44+
set dn_rpc_port=%%i
45+
)
46+
) ELSE IF EXIST "%IOTDB_CONF%\iotdb-datanode.properties" (
4247
for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_rpc_port"
4348
"%IOTDB_CONF%\iotdb-datanode.properties"') do (
4449
set dn_rpc_port=%%i

‎iotdb-client/cli/src/assembly/resources/tools/backup.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,12 @@ get_properties_value() {
7070
local file_name=$1
7171
local property_name=$2
7272
local default_value=$3
73-
local property_value=$(sed "/^${property_name}=/!d;s/.*=//" "${IOTDB_HOME}/conf/${file_name}.properties")
73+
if [ -f "${IOTDB_HOME}/conf/iotdb-system.properties" ]; then
74+
local file_path="${IOTDB_HOME}/conf/iotdb-system.properties"
75+
else
76+
local file_path="${IOTDB_HOME}/conf/${file_name}.properties"
77+
fi
78+
local property_value=$(sed "/^${property_name}=/!d;s/.*=//" "${file_path}")
7479
if [ -z "$property_value" ]; then
7580
property_value="$default_value"
7681
fi

‎iotdb-client/cli/src/assembly/resources/tools/collect-info.bat

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ set "passwd_param=root"
4646
set "host_param=127.0.0.1"
4747
set "port_param=6667"
4848

49-
set "properties_file=%IOTDB_HOME%\conf\iotdb-datanode.properties"
49+
if exist "%IOTDB_HOME%\conf\iotdb-system.properties" (
50+
set "properties_file=%IOTDB_HOME%\conf\iotdb-system.properties"
51+
) else (
52+
set "properties_file=%IOTDB_HOME%\conf\iotdb-datanode.properties"
53+
)
5054
set "key=dn_data_dirs"
5155

5256
for /f "usebackq tokens=1,* delims==" %%a in ("%properties_file%") do (

‎iotdb-client/cli/src/assembly/resources/tools/collect-info.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ choose_unit() {
8585
echo "$unit"
8686
}
8787

88-
properties_file="$IOTDB_HOME/conf/iotdb-datanode.properties"
88+
if [ -f "$IOTDB_HOME/conf/iotdb-system.properties" ]; then
89+
properties_file="$IOTDB_HOME/conf/iotdb-system.properties"
90+
else
91+
properties_file="$IOTDB_HOME/conf/iotdb-datanode.properties"
92+
fi
8993
data_dir_key="dn_data_dirs"
9094
value=$(get_property_value "$properties_file" "$data_dir_key")
9195
if [ -n "$value" ]; then

‎iotdb-client/cli/src/main/java/org/apache/iotdb/tool/IoTDBDataBackTool.java

+18-21
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.apache.iotdb.tool;
2121

22+
import org.apache.iotdb.commons.conf.CommonConfig;
2223
import org.apache.iotdb.commons.conf.IoTDBConstant;
23-
import org.apache.iotdb.db.conf.IoTDBConfig;
2424
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2525

2626
import org.slf4j.Logger;
@@ -62,8 +62,6 @@ public class IoTDBDataBackTool {
6262
static String targetWalDirParam = "";
6363
static String remoteDnDataDir = "";
6464

65-
static String DATA_NODE_CONF_NAME = IoTDBConfig.CONFIG_NAME;
66-
static String CONFIG_NODE_CONF_NAME = "iotdb-confignode.properties";
6765
static AtomicInteger fileCount = new AtomicInteger(0);
6866
static AtomicInteger targetFileCount = new AtomicInteger(0);
6967
static AtomicInteger processFileCount = new AtomicInteger(0);
@@ -177,10 +175,10 @@ public static void main(String[] args) {
177175
System.setProperty("IOTDB_HOME", System.getenv("IOTDB_HOME"));
178176
argsParse(args);
179177
File sourceDir = new File(sourcePath);
180-
Properties dataProperties = getProperties(IoTDBConfig.CONFIG_NAME);
181-
initDataNodeProperties(dataProperties);
182-
Properties configProperties = getProperties(CONFIG_NODE_CONF_NAME);
183-
initConfigNodeProperties(configProperties);
178+
179+
Properties properties = getProperties(CommonConfig.SYSTEM_CONFIG_NAME);
180+
initDataNodeProperties(properties);
181+
initConfigNodeProperties(properties);
184182

185183
StringBuilder targetDirString = new StringBuilder();
186184
Map<String, String> copyMap = new HashMap<>();
@@ -215,7 +213,7 @@ public static void main(String[] args) {
215213
+ File.separatorChar
216214
+ "conf"
217215
+ File.separatorChar
218-
+ CONFIG_NODE_CONF_NAME,
216+
+ CommonConfig.SYSTEM_CONFIG_NAME,
219217
cnMapProperties);
220218
} else if (nodeTypeParam.equalsIgnoreCase("datanode")) {
221219
countDataNodeFile(targetDirString.toString(), copyMap, dnDataDirsMap, dnMapProperties);
@@ -237,7 +235,7 @@ public static void main(String[] args) {
237235
+ File.separatorChar
238236
+ "conf"
239237
+ File.separatorChar
240-
+ DATA_NODE_CONF_NAME,
238+
+ CommonConfig.SYSTEM_CONFIG_NAME,
241239
dnMapProperties);
242240
} else if (nodeTypeParam.equalsIgnoreCase("all") || nodeTypeParam.isEmpty()) {
243241
countConfigNodeFile(targetDirString.toString(), copyMap, cnMapProperties);
@@ -260,14 +258,14 @@ public static void main(String[] args) {
260258
+ File.separatorChar
261259
+ "conf"
262260
+ File.separatorChar
263-
+ CONFIG_NODE_CONF_NAME,
261+
+ CommonConfig.SYSTEM_CONFIG_NAME,
264262
cnMapProperties);
265263
propertiesFileUpdate(
266264
targetDirString.toString()
267265
+ File.separatorChar
268266
+ "conf"
269267
+ File.separatorChar
270-
+ DATA_NODE_CONF_NAME,
268+
+ CommonConfig.SYSTEM_CONFIG_NAME,
271269
dnMapProperties);
272270
}
273271

@@ -293,7 +291,7 @@ public static void main(String[] args) {
293291
+ File.separatorChar
294292
+ "conf"
295293
+ File.separatorChar
296-
+ CONFIG_NODE_CONF_NAME,
294+
+ CommonConfig.SYSTEM_CONFIG_NAME,
297295
cnMapProperties);
298296
} else if (nodeTypeParam.equalsIgnoreCase("datanode")) {
299297
countNodeBack(targetDirString.toString(), copyMap);
@@ -313,7 +311,7 @@ public static void main(String[] args) {
313311
+ File.separatorChar
314312
+ "conf"
315313
+ File.separatorChar
316-
+ DATA_NODE_CONF_NAME,
314+
+ CommonConfig.SYSTEM_CONFIG_NAME,
317315
dnMapProperties);
318316
} else if (nodeTypeParam.equalsIgnoreCase("all") || nodeTypeParam.isEmpty()) {
319317
countNodeBack(targetDirString.toString(), copyMap);
@@ -335,14 +333,14 @@ public static void main(String[] args) {
335333
+ File.separatorChar
336334
+ "conf"
337335
+ File.separatorChar
338-
+ CONFIG_NODE_CONF_NAME,
336+
+ CommonConfig.SYSTEM_CONFIG_NAME,
339337
cnMapProperties);
340338
propertiesFileUpdate(
341339
targetDirString.toString()
342340
+ File.separatorChar
343341
+ "conf"
344342
+ File.separatorChar
345-
+ DATA_NODE_CONF_NAME,
343+
+ CommonConfig.SYSTEM_CONFIG_NAME,
346344
dnMapProperties);
347345
}
348346
}
@@ -444,10 +442,9 @@ private static void ioTDBDataBack(
444442

445443
private static void countNodeBack(String targetDirString, Map<String, String> copyMap) {
446444
File sourceDir = new File(sourcePath);
447-
Properties dataProperties = getProperties(IoTDBConfig.CONFIG_NAME);
448-
initDataNodeProperties(dataProperties);
449-
Properties configProperties = getProperties(CONFIG_NODE_CONF_NAME);
450-
initConfigNodeProperties(configProperties);
445+
Properties properties = getProperties(CommonConfig.SYSTEM_CONFIG_NAME);
446+
initDataNodeProperties(properties);
447+
initConfigNodeProperties(properties);
451448

452449
copyMap.put(
453450
sourceDir.getAbsolutePath() + File.separatorChar + ".env",
@@ -495,7 +492,7 @@ private static void countDataNodeFile(
495492
Map<String, String> copyMap,
496493
Map<String, String> dnDataDirsMap,
497494
Map<String, String> dnMapProperties) {
498-
Properties dataProperties = getProperties(IoTDBConfig.CONFIG_NAME);
495+
Properties dataProperties = getProperties(CommonConfig.SYSTEM_CONFIG_NAME);
499496
initDataNodeProperties(dataProperties);
500497

501498
String dnSystemDir = dataProperties.getProperty("dn_system_dir");
@@ -593,7 +590,7 @@ private static String isObjectStorage(String dnDataDirs) {
593590

594591
private static void countConfigNodeFile(
595592
String targetDirString, Map<String, String> copyMap, Map<String, String> cnMapProperties) {
596-
Properties configProperties = getProperties(CONFIG_NODE_CONF_NAME);
593+
Properties configProperties = getProperties(CommonConfig.SYSTEM_CONFIG_NAME);
597594
initConfigNodeProperties(configProperties);
598595

599596
String bakCnSystemDir = targetDirString + File.separatorChar + DEFAULT_CN_SYSTEM_DIR;

‎iotdb-core/confignode/src/assembly/confignode.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
</fileSets>
4545
<files>
4646
<file>
47-
<source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties</source>
48-
<destName>conf/iotdb-common.properties</destName>
47+
<source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties</source>
48+
<destName>conf/iotdb-system.properties</destName>
4949
</file>
5050
<file>
5151
<source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source>

0 commit comments

Comments
 (0)