This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch hera
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/hera by this push:
new 8bc03d13d26 partial replace
8bc03d13d26 is described below
commit 8bc03d13d26c10b322b5ec8c68b68ad1e69cc2cf
Author: JackieTien97 <[email protected]>
AuthorDate: Wed Jul 30 10:58:17 2025 +0800
partial replace
---
.../main/DockerCompose/replace-conf-from-env.sh | 2 +-
.../src/assembly/resources/tools/load-tsfile.sh | 4 ++--
iotdb-core/confignode/src/assembly/confignode.xml | 8 +++----
.../assembly/resources/sbin/start-confignode.sh | 8 +++----
.../src/assembly/resources/sbin/stop-confignode.sh | 2 +-
.../iotdb/confignode/service/ConfigNode.java | 2 +-
.../src/assembly/resources/sbin/start-datanode.sh | 8 +++----
.../src/assembly/resources/sbin/stop-datanode.sh | 2 +-
.../resources/tools/schema/print-pb-tree-file.sh | 2 +-
.../resources/tools/schema/print-schema-log.sh | 2 +-
.../check-overlap-sequence-files-and-repair.sh | 2 +-
.../tools/tsfile/overlap-statistic-tool.sh | 2 +-
.../resources/tools/tsfile/print-iotdb-data-dir.sh | 2 +-
.../tools/tsfile/print-tsfile-resource-files.sh | 2 +-
.../resources/tools/tsfile/print-tsfile.sh | 2 +-
.../resources/tools/tsfile/split-tsfile-tool.sh | 2 +-
.../resources/tools/tsfile/validate-tsfile.sh | 2 +-
iotdb-core/datanode/src/assembly/server.xml | 22 ++++++++---------
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../schemaengine/schemaregion/tag/TagLogFile.java | 2 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 6 ++---
iotdb-core/node-commons/pom.xml | 2 +-
...iotdb-cluster.properties => cluster.properties} | 0
.../{iotdb-system.properties => system.properties} | 0
...perties.template => system.properties.template} | 0
.../resources/sbin/{iotdb-common.sh => common.sh} | 28 +++++++++++-----------
.../src/assembly/resources/sbin/destroy-all.sh | 2 +-
.../src/assembly/resources/sbin/start-all.sh | 2 +-
.../src/assembly/resources/sbin/stop-all.sh | 2 +-
.../apache/iotdb/commons/conf/CommonConfig.java | 4 ++--
30 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/docker/src/main/DockerCompose/replace-conf-from-env.sh
b/docker/src/main/DockerCompose/replace-conf-from-env.sh
index 00a48050d7e..315b9b0c320 100755
--- a/docker/src/main/DockerCompose/replace-conf-from-env.sh
+++ b/docker/src/main/DockerCompose/replace-conf-from-env.sh
@@ -19,7 +19,7 @@
#
conf_path=${IOTDB_HOME}/conf
-target_files="iotdb-system.properties"
+target_files="system.properties"
function process_single(){
local key_value="$1"
diff --git a/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.sh
b/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.sh
index 820ca5fcc2d..1d7d6703dc6 100755
--- a/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.sh
+++ b/iotdb-client/cli/src/assembly/resources/tools/load-tsfile.sh
@@ -22,8 +22,8 @@ echo ---------------------
echo Start Loading TsFile
echo ---------------------
-source "$(dirname "$0")/../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+source "$(dirname "$0")/../sbin/common.sh"
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}"
diff --git a/iotdb-core/confignode/src/assembly/confignode.xml
b/iotdb-core/confignode/src/assembly/confignode.xml
index 638e4793475..f24276e6b49 100644
--- a/iotdb-core/confignode/src/assembly/confignode.xml
+++ b/iotdb-core/confignode/src/assembly/confignode.xml
@@ -44,12 +44,12 @@
</fileSets>
<files>
<file>
-
<source>${project.basedir}/../node-commons/src/assembly/resources/conf/iotdb-system.properties</source>
- <destName>conf/iotdb-system.properties</destName>
+
<source>${project.basedir}/../node-commons/src/assembly/resources/conf/system.properties</source>
+ <destName>conf/system.properties</destName>
</file>
<file>
-
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source>
- <destName>sbin/iotdb-common.sh</destName>
+
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/common.sh</source>
+ <destName>sbin/common.sh</destName>
</file>
</files>
</assembly>
diff --git
a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
index 130810578ec..3f3c9fccfcf 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
@@ -67,7 +67,7 @@ while true; do
;;
-D)
IOTDB_JVM_OPTS="$IOTDB_JVM_OPTS -D$2"
- #checkConfigNodeEnvVariables is in iotdb-common.sh
+ #checkConfigNodeEnvVariables is in common.sh
checkConfigNodeEnvVariables $2
shift 2
;;
@@ -109,15 +109,15 @@ if [ "$(id -u)" -ne 0 ]; then
echo "Notice: in some systems, ConfigNode must run in sudo mode to write
data. The process may fail."
fi
-#checkAllVariables is in iotdb-common.sh
+#checkAllVariables is in common.sh
checkAllConfigNodeVariables
-#checkConfigNodePortUsages is in iotdb-common.sh
+#checkConfigNodePortUsages is in common.sh
checkConfigNodePortUsages
PARAMS="-s $PARAMS"
-#initEnv is in iotdb-common.sh
+#initEnv is in common.sh
initConfigNodeEnv
CONFIGNODE_JMX_OPTS="$CONFIGNODE_JMX_OPTS $IOTDB_HEAP_DUMP_COMMAND"
diff --git
a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
index dfc214865a7..7152547dcaa 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
@@ -22,7 +22,7 @@ source "$(dirname "$0")/iotdb-common.sh"
CONFIGNODE_CONF="$(dirname "$0")/../conf"
if [ -f "${CONFIGNODE_CONF}/iotdb-system.properties" ]; then
- cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/iotdb-system.properties)
+ cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/system.properties)
# trim the port
cn_internal_port=$(echo "$cn_internal_port" | sed -e 's/^[[:space:]]*//'
-e 's/[[:space:]]*$//')
else
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 7f0db7a3784..272a2abcb76 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -361,7 +361,7 @@ public class ConfigNode extends ServerCommandLine
implements ConfigNodeMBean {
TEndPoint seedConfigNode = CONF.getSeedConfigNode();
if (seedConfigNode == null) {
- LOGGER.error("Please set the cn_seed_config_node parameter in
iotdb-system.properties file.");
+ LOGGER.error("Please set the cn_seed_config_node parameter in
system.properties file.");
throw new StartupException("The seedConfigNode setting in conf is
empty");
}
diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.sh
b/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.sh
index 351f6de45ff..a89ca80f591 100755
--- a/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.sh
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.sh
@@ -62,7 +62,7 @@ while true; do
;;
-D)
IOTDB_JVM_OPTS="$IOTDB_JVM_OPTS -D$2"
- #checkEnvVariables is in iotdb-common.sh
+ #checkEnvVariables is in common.sh
checkEnvVariables "$2"
shift 2
;;
@@ -102,10 +102,10 @@ if [ "$(id -u)" -ne 0 ]; then
echo "Notice: in some systems, DataNode must run in sudo mode to write data.
The process may fail."
fi
-#checkAllVariables is in iotdb-common.sh
+#checkAllVariables is in common.sh
checkAllVariables
-#checkDataNodePortUsages is in iotdb-common.sh
+#checkDataNodePortUsages is in common.sh
checkDataNodePortUsages
CLASSPATH=""
@@ -138,7 +138,7 @@ echo ---------------------
echo "Starting IoTDB DataNode"
echo ---------------------
-#initEnv is in iotdb-common.sh
+#initEnv is in common.sh
initEnv
# check whether we can enable heap dump when oom
diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
index 1f6711cfa93..af56d39a6cd 100644
--- a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
@@ -22,7 +22,7 @@ source "$(dirname "$0")/iotdb-common.sh"
DATANODE_CONF="`dirname "$0"`/../conf"
if [ -f "${DATANODE_CONF}/iotdb-system.properties" ]; then
- dn_rpc_port=`sed '/^dn_rpc_port=/!d;s/.*=//'
${DATANODE_CONF}/iotdb-system.properties`
+ dn_rpc_port=`sed '/^dn_rpc_port=/!d;s/.*=//'
${DATANODE_CONF}/system.properties`
# trim the port
dn_rpc_port=$(echo "$dn_rpc_port" | sed -e 's/^[[:space:]]*//' -e
's/[[:space:]]*$//')
else
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/schema/print-pb-tree-file.sh
b/iotdb-core/datanode/src/assembly/resources/tools/schema/print-pb-tree-file.sh
index c5d895b1747..a7088920637 100644
---
a/iotdb-core/datanode/src/assembly/resources/tools/schema/print-pb-tree-file.sh
+++
b/iotdb-core/datanode/src/assembly/resources/tools/schema/print-pb-tree-file.sh
@@ -23,7 +23,7 @@ echo Starting Sketching the IoTDB SchemaFile
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/schema/print-schema-log.sh
b/iotdb-core/datanode/src/assembly/resources/tools/schema/print-schema-log.sh
index 6730b23131c..8110aabb9fd 100644
---
a/iotdb-core/datanode/src/assembly/resources/tools/schema/print-schema-log.sh
+++
b/iotdb-core/datanode/src/assembly/resources/tools/schema/print-schema-log.sh
@@ -23,7 +23,7 @@ echo Starting Parsing the IoTDB Mlog or Snapshot
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/check-overlap-sequence-files-and-repair.sh
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/check-overlap-sequence-files-and-repair.sh
index 76557b2f068..0d1b60d014e 100644
---
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/check-overlap-sequence-files-and-repair.sh
+++
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/check-overlap-sequence-files-and-repair.sh
@@ -23,7 +23,7 @@ echo Starting Validating the TsFile resources
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/overlap-statistic-tool.sh
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/overlap-statistic-tool.sh
index cd34eab61a6..aa326403c34 100644
---
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/overlap-statistic-tool.sh
+++
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/overlap-statistic-tool.sh
@@ -23,7 +23,7 @@ echo Starting Validating the TsFile
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.sh
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.sh
index 4571ac7dfa7..b55129a28e8 100644
---
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.sh
+++
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-iotdb-data-dir.sh
@@ -23,7 +23,7 @@ echo Starting Printing the IoTDB Data Directory Overview
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.sh
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.sh
index 560deecc7f9..521dbb7f423 100755
---
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.sh
+++
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile-resource-files.sh
@@ -24,7 +24,7 @@ echo Starting Printing the TsFileResources
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile.sh
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile.sh
index 8864ca877e7..15e35fad95b 100644
--- a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile.sh
+++ b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/print-tsfile.sh
@@ -23,7 +23,7 @@ echo Starting Printing the TsFile Sketch
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/split-tsfile-tool.sh
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/split-tsfile-tool.sh
index 0265cb4ac28..154a3bb4453 100644
---
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/split-tsfile-tool.sh
+++
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/split-tsfile-tool.sh
@@ -23,7 +23,7 @@ echo Start Splitting TsFile
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git
a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/validate-tsfile.sh
b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/validate-tsfile.sh
index c37bda1c1c4..f7d1c2be078 100644
--- a/iotdb-core/datanode/src/assembly/resources/tools/tsfile/validate-tsfile.sh
+++ b/iotdb-core/datanode/src/assembly/resources/tools/tsfile/validate-tsfile.sh
@@ -23,7 +23,7 @@ echo Starting Validating the TsFile
echo ---------------------
source "$(dirname "$0")/../../sbin/iotdb-common.sh"
-#get_iotdb_include and checkAllVariables is in iotdb-common.sh
+#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
export IOTDB_HOME="${IOTDB_HOME}/.."
diff --git a/iotdb-core/datanode/src/assembly/server.xml
b/iotdb-core/datanode/src/assembly/server.xml
index fc3b1ccf2a1..bde869ea733 100644
--- a/iotdb-core/datanode/src/assembly/server.xml
+++ b/iotdb-core/datanode/src/assembly/server.xml
@@ -39,25 +39,25 @@
</fileSets>
<files>
<file>
-
<source>${project.basedir}/../node-commons/src/assembly/resources/conf/iotdb-system.properties</source>
- <destName>conf/iotdb-system.properties</destName>
+
<source>${project.basedir}/../node-commons/src/assembly/resources/conf/system.properties</source>
+ <destName>conf/system.properties</destName>
</file>
- <!-- copy iotdb-common.sh to different script folders-->
+ <!-- copy common.sh to different script folders-->
<file>
-
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source>
- <destName>sbin/iotdb-common.sh</destName>
+
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/common.sh</source>
+ <destName>sbin/common.sh</destName>
</file>
<file>
-
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source>
- <destName>tools/iotdb-common.sh</destName>
+
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/common.sh</source>
+ <destName>tools/common.sh</destName>
</file>
<file>
-
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source>
- <destName>tools/tsfileToolSet/iotdb-common.sh</destName>
+
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/common.sh</source>
+ <destName>tools/tsfileToolSet/common.sh</destName>
</file>
<file>
-
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/iotdb-common.sh</source>
- <destName>tools/schema/iotdb-common.sh</destName>
+
<source>${project.basedir}/../node-commons/src/assembly/resources/sbin/common.sh</source>
+ <destName>tools/schema/common.sh</destName>
</file>
</files>
</assembly>
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 00310772704..96f969bd372 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -78,7 +78,7 @@ public class IoTDBConfig {
/* Names of Watermark methods */
public static final String WATERMARK_GROUPED_LSB = "GroupBasedLSBMethod";
- public static final String CONFIG_NAME = "iotdb-system.properties";
+ public static final String CONFIG_NAME = "system.properties";
private static final Logger logger =
LoggerFactory.getLogger(IoTDBConfig.class);
private static final String MULTI_DIR_STRATEGY_PREFIX =
"org.apache.iotdb.db.storageengine.rescon.disk.strategy.";
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
index b63d5a68abb..bdfd46b3cc2 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/tag/TagLogFile.java
@@ -50,7 +50,7 @@ public class TagLogFile implements AutoCloseable {
private FileChannel fileChannel;
private static final String LENGTH_EXCEED_MSG =
"Tag/Attribute exceeds the max length limit. "
- + "Please enlarge tag_attribute_total_size in
iotdb-system.properties";
+ + "Please enlarge tag_attribute_total_size in system.properties";
private static final int MAX_LENGTH =
CommonDescriptor.getInstance().getConfig().getTagAttributeTotalSize();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
index b554eb92419..6f0d9cb5e0b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -345,7 +345,7 @@ public class DataNode extends ServerCommandLine implements
DataNodeMBean {
DEFAULT_RETRY);
throw new StartupException(
"Cannot pull system configurations from ConfigNode-leader. "
- + "Please check whether the dn_seed_config_node in
iotdb-system.properties is correct or alive.");
+ + "Please check whether the dn_seed_config_node in
system.properties is correct or alive.");
}
/* Load system configurations */
@@ -476,7 +476,7 @@ public class DataNode extends ServerCommandLine implements
DataNodeMBean {
logger.error("Cannot register into cluster after {} retries.",
DEFAULT_RETRY);
throw new StartupException(
"Cannot register into the cluster. "
- + "Please check whether the dn_seed_config_node in
iotdb-system.properties is correct or alive.");
+ + "Please check whether the dn_seed_config_node in
system.properties is correct or alive.");
}
if (dataNodeRegisterResp.getStatus().getCode() ==
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
@@ -639,7 +639,7 @@ public class DataNode extends ServerCommandLine implements
DataNodeMBean {
DEFAULT_RETRY);
throw new StartupException(
"Cannot send restart DataNode request to ConfigNode-leader. "
- + "Please check whether the dn_seed_config_node in
iotdb-system.properties is correct or alive.");
+ + "Please check whether the dn_seed_config_node in
system.properties is correct or alive.");
}
if (dataNodeRestartResp.getStatus().getCode() ==
TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
diff --git a/iotdb-core/node-commons/pom.xml b/iotdb-core/node-commons/pom.xml
index 89e8ba2344a..4340f8d35cc 100644
--- a/iotdb-core/node-commons/pom.xml
+++ b/iotdb-core/node-commons/pom.xml
@@ -202,7 +202,7 @@
<resource>
<directory>${project.basedir}/src/assembly/resources/conf</directory>
<includes>
- <include>iotdb-system.properties.template</include>
+ <include>system.properties.template</include>
</includes>
<filtering>false</filtering>
</resource>
diff --git
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-cluster.properties
b/iotdb-core/node-commons/src/assembly/resources/conf/cluster.properties
similarity index 100%
rename from
iotdb-core/node-commons/src/assembly/resources/conf/iotdb-cluster.properties
rename to iotdb-core/node-commons/src/assembly/resources/conf/cluster.properties
diff --git
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties
b/iotdb-core/node-commons/src/assembly/resources/conf/system.properties
similarity index 100%
rename from
iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties
rename to iotdb-core/node-commons/src/assembly/resources/conf/system.properties
diff --git
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
b/iotdb-core/node-commons/src/assembly/resources/conf/system.properties.template
similarity index 100%
rename from
iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
rename to
iotdb-core/node-commons/src/assembly/resources/conf/system.properties.template
diff --git
a/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/common.sh
old mode 100755
new mode 100644
similarity index 95%
rename from iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh
rename to iotdb-core/node-commons/src/assembly/resources/sbin/common.sh
index 0236fef3f41..624338e0602
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/common.sh
@@ -169,17 +169,17 @@ checkDataNodePortUsages () {
fi
occupied=false
if [ -f "$IOTDB_CONF/iotdb-system.properties" ]; then
- dn_rpc_port=$(sed '/^dn_rpc_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-system.properties)
- dn_internal_port=$(sed '/^dn_internal_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-system.properties)
- dn_mpp_data_exchange_port=$(sed
'/^dn_mpp_data_exchange_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-system.properties)
- dn_schema_region_consensus_port=$(sed
'/^dn_schema_region_consensus_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-system.properties)
- dn_data_region_consensus_port=$(sed
'/^dn_data_region_consensus_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-system.properties)
+ dn_rpc_port=$(sed '/^dn_rpc_port=/!d;s/.*=//'
"${IOTDB_CONF}"/system.properties)
+ dn_internal_port=$(sed '/^dn_internal_port=/!d;s/.*=//'
"${IOTDB_CONF}"/system.properties)
+ dn_mpp_data_exchange_port=$(sed
'/^dn_mpp_data_exchange_port=/!d;s/.*=//' "${IOTDB_CONF}"/system.properties)
+ dn_schema_region_consensus_port=$(sed
'/^dn_schema_region_consensus_port=/!d;s/.*=//'
"${IOTDB_CONF}"/system.properties)
+ dn_data_region_consensus_port=$(sed
'/^dn_data_region_consensus_port=/!d;s/.*=//' "${IOTDB_CONF}"/system.properties)
elif [ -f "$IOTDB_HOME/conf/iotdb-system.properties" ]; then
- dn_rpc_port=$(sed '/^dn_rpc_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/iotdb-system.properties)
- dn_internal_port=$(sed '/^dn_internal_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/iotdb-system.properties)
- dn_mpp_data_exchange_port=$(sed
'/^dn_mpp_data_exchange_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/iotdb-system.properties)
- dn_schema_region_consensus_port=$(sed
'/^dn_schema_region_consensus_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/iotdb-system.properties)
- dn_data_region_consensus_port=$(sed
'/^dn_data_region_consensus_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/iotdb-system.properties)
+ dn_rpc_port=$(sed '/^dn_rpc_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/system.properties)
+ dn_internal_port=$(sed '/^dn_internal_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/system.properties)
+ dn_mpp_data_exchange_port=$(sed
'/^dn_mpp_data_exchange_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/system.properties)
+ dn_schema_region_consensus_port=$(sed
'/^dn_schema_region_consensus_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/system.properties)
+ dn_data_region_consensus_port=$(sed
'/^dn_data_region_consensus_port=/!d;s/.*=//'
"${IOTDB_HOME}"/conf/system.properties)
elif [ -f "$IOTDB_CONF/iotdb-datanode.properties" ]; then
dn_rpc_port=$(sed '/^dn_rpc_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-datanode.properties)
dn_internal_port=$(sed '/^dn_internal_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-datanode.properties)
@@ -276,11 +276,11 @@ checkConfigNodePortUsages () {
fi
occupied=false
if [ -f "$CONFIGNODE_CONF/iotdb-system.properties" ]; then
- cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/iotdb-system.properties)
- cn_consensus_port=$(sed '/^cn_consensus_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/iotdb-system.properties)
+ cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/system.properties)
+ cn_consensus_port=$(sed '/^cn_consensus_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/system.properties)
elif [ -f "$CONFIGNODE_HOME/conf/iotdb-system.properties" ]; then
- cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_HOME}"/conf/iotdb-system.properties)
- cn_consensus_port=$(sed '/^cn_consensus_port=/!d;s/.*=//'
"${CONFIGNODE_HOME}"/conf/iotdb-system.properties)
+ cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_HOME}"/conf/system.properties)
+ cn_consensus_port=$(sed '/^cn_consensus_port=/!d;s/.*=//'
"${CONFIGNODE_HOME}"/conf/system.properties)
elif [ -f "$CONFIGNODE_CONF/iotdb-confignode.properties" ]; then
cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/iotdb-confignode.properties)
cn_consensus_port=$(sed '/^cn_consensus_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/iotdb-confignode.properties)
diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-all.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-all.sh
index 289a5c6c8f9..80e51ea0737 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-all.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-all.sh
@@ -25,7 +25,7 @@ if [[ "$CLEAN_SERVICE" != "y" && "$CLEAN_SERVICE" != "Y" ]];
then
fi
export IOTDB_HOME="`dirname "$0"`/.."
-IOTDB_CLUSTER_PATH="${IOTDB_HOME}"/conf/iotdb-cluster.properties
+IOTDB_CLUSTER_PATH="${IOTDB_HOME}"/conf/cluster.properties
if [ ! -f ${IOTDB_CLUSTER_PATH} ]; then
exec ${IOTDB_HOME}/sbin/stop-standalone.sh -f >/dev/null 2>&1 &
exec rm -rf ${IOTDB_HOME}/data/
diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/start-all.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/start-all.sh
index d9204cdcd38..10d68b4c2bf 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/start-all.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/start-all.sh
@@ -21,7 +21,7 @@
if [ -z "${IOTDB_HOME}" ]; then
export IOTDB_HOME="`dirname "$0"`/.."
fi
-IOTDB_CLUSTER_PATH="${IOTDB_HOME}"/conf/iotdb-cluster.properties
+IOTDB_CLUSTER_PATH="${IOTDB_HOME}"/conf/cluster.properties
if [ ! -f ${IOTDB_CLUSTER_PATH} ]; then
exec ${IOTDB_HOME}/sbin/start-standalone.sh
else
diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/stop-all.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/stop-all.sh
index b28fba9bd75..552cdd3513a 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/stop-all.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/stop-all.sh
@@ -21,7 +21,7 @@
if [ -z "${IOTDB_HOME}" ]; then
export IOTDB_HOME="`dirname "$0"`/.."
fi
-IOTDB_CLUSTER_PATH="${IOTDB_HOME}"/conf/iotdb-cluster.properties
+IOTDB_CLUSTER_PATH="${IOTDB_HOME}"/conf/cluster.properties
if [ ! -f ${IOTDB_CLUSTER_PATH} ]; then
exec ${IOTDB_HOME}/sbin/stop-standalone.sh
else
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index 894a28487fa..2b2c0a39961 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -48,8 +48,8 @@ public class CommonConfig {
public static final String OLD_CONFIG_NODE_CONFIG_NAME =
"iotdb-confignode.properties";
public static final String OLD_DATA_NODE_CONFIG_NAME =
"iotdb-datanode.properties";
public static final String OLD_COMMON_CONFIG_NAME =
"iotdb-common.properties";
- public static final String SYSTEM_CONFIG_NAME = "iotdb-system.properties";
- public static final String SYSTEM_CONFIG_TEMPLATE_NAME =
"iotdb-system.properties.template";
+ public static final String SYSTEM_CONFIG_NAME = "system.properties";
+ public static final String SYSTEM_CONFIG_TEMPLATE_NAME =
"system.properties.template";
private static final Logger logger =
LoggerFactory.getLogger(CommonConfig.class);
// Open ID Secret
