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 e809cc00b73 fix version check
e809cc00b73 is described below
commit e809cc00b7390b0210d6d8ae06f67ab12e15d8c8
Author: JackieTien97 <[email protected]>
AuthorDate: Wed Jul 30 11:13:17 2025 +0800
fix version check
---
docker/src/main/Dockerfile-1c1d | 16 +++++++--------
.../iotdb/it/env/cluster/ClusterConstant.java | 2 +-
.../it/db/it/IoTDBLoadConfigurationTableIT.java | 2 +-
.../cli/src/assembly/resources/tools/backup.bat | 8 ++++----
.../cli/src/assembly/resources/tools/backup.sh | 4 ++--
.../src/assembly/resources/tools/collect-info.bat | 4 ++--
.../src/assembly/resources/tools/collect-info.sh | 4 ++--
.../src/assembly/resources/conf/confignode-env.sh | 4 ++--
.../assembly/resources/sbin/start-confignode.bat | 10 ++++-----
.../assembly/resources/sbin/start-confignode.sh | 2 +-
.../assembly/resources/sbin/stop-confignode.bat | 4 ++--
.../src/assembly/resources/sbin/stop-confignode.sh | 4 ++--
.../src/assembly/resources/conf/datanode-env.sh | 4 ++--
.../src/assembly/resources/sbin/start-datanode.bat | 10 ++++-----
.../src/assembly/resources/sbin/start-datanode.sh | 2 +-
.../src/assembly/resources/sbin/stop-datanode.bat | 4 ++--
.../src/assembly/resources/sbin/stop-datanode.sh | 4 ++--
.../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 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 10 ++++-----
.../java/org/apache/iotdb/db/service/DataNode.java | 4 ++--
.../iotdb/db/utils/ConfigurationFileUtilsTest.java | 2 +-
.../src/assembly/resources/sbin/common.sh | 12 +++++------
.../assembly/resources/sbin/destroy-confignode.bat | 4 ++--
.../assembly/resources/sbin/destroy-confignode.sh | 4 ++--
.../assembly/resources/sbin/destroy-datanode.bat | 4 ++--
.../assembly/resources/sbin/destroy-datanode.sh | 4 ++--
.../src/assembly/resources/sbin/health_check.bat | 24 +++++++++++-----------
.../src/assembly/resources/sbin/health_check.sh | 6 +++---
36 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d
index 9a5605c1f2b..b0823d18ae5 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-1c1d
@@ -30,19 +30,19 @@ RUN apt update \
&& rm /apache-iotdb-*-bin.zip \
&& mv /apache-iotdb-* /iotdb \
&& mv /start-1c1d.sh /iotdb/sbin \
- && sed -i 's/dn_internal_address=127.0.0.1/dn_internal_address=0.0.0.0/g'
/iotdb/conf/iotdb-system.properties \
- && sed -i 's/cn_internal_address=127.0.0.1/cn_internal_address=0.0.0.0/g'
/iotdb/conf/iotdb-system.properties \
- && 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 \
- && 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 \
- && 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 \
- && 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 \
- && 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 \
+ && sed -i 's/dn_internal_address=127.0.0.1/dn_internal_address=0.0.0.0/g'
/iotdb/conf/system.properties \
+ && sed -i 's/cn_internal_address=127.0.0.1/cn_internal_address=0.0.0.0/g'
/iotdb/conf/system.properties \
+ && sed -i
's/cn_seed_config_node=127.0.0.1:10710/cn_seed_config_node=0.0.0.0:10710/g'
/iotdb/conf/system.properties \
+ && sed -i
's/dn_seed_config_node=127.0.0.1:10710/dn_seed_config_node=0.0.0.0:10710/g'
/iotdb/conf/system.properties \
+ && 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/system.properties \
+ && 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/system.properties \
+ && 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/system.properties \
&& apt remove unzip -y \
&& apt autoremove -y \
&& apt purge --auto-remove -y \
&& apt clean -y \
RUN dos2unix /iotdb/sbin/start-1c1d.sh
-RUN dos2unix /iotdb/sbin/../conf/iotdb-common.sh
+RUN dos2unix /iotdb/sbin/../conf/common.sh
RUN dos2unix /iotdb/sbin/start-confignode.sh
RUN dos2unix /iotdb/sbin/../conf/confignode-env.sh
RUN dos2unix /iotdb/sbin/stop-confignode.sh
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java
index 3162f47ebe8..cb69caf331a 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/ClusterConstant.java
@@ -148,7 +148,7 @@ public class ClusterConstant {
"pipeConsensusStreamMode.dataRegionReplicaNumber";
// Property file names
- public static final String IOTDB_SYSTEM_PROPERTIES_FILE =
"iotdb-system.properties";
+ public static final String IOTDB_SYSTEM_PROPERTIES_FILE =
"system.properties";
// Properties' keys
// Common
diff --git
a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBLoadConfigurationTableIT.java
b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBLoadConfigurationTableIT.java
index 53e8bc9487e..daa5ae7da8a 100644
---
a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBLoadConfigurationTableIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBLoadConfigurationTableIT.java
@@ -62,7 +62,7 @@ public class IoTDBLoadConfigurationTableIT {
+ File.separator
+ "conf"
+ File.separator
- + "iotdb-system.properties";
+ + "system.properties";
long length = new File(confPath).length();
try (FileWriter fileWriter = new FileWriter(confPath, true)) {
fileWriter.write(System.lineSeparator());
diff --git a/iotdb-client/cli/src/assembly/resources/tools/backup.bat
b/iotdb-client/cli/src/assembly/resources/tools/backup.bat
index 0fa7c82776e..70035102070 100644
--- a/iotdb-client/cli/src/assembly/resources/tools/backup.bat
+++ b/iotdb-client/cli/src/assembly/resources/tools/backup.bat
@@ -38,9 +38,9 @@ IF EXIST "%IOTDB_CONF%\datanode-env.bat" (
echo Can't find datanode-env.bat
)
-IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
+IF EXIST "%IOTDB_CONF%\system.properties" (
for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^dn_rpc_port"
- "%IOTDB_CONF%\iotdb-system.properties"') do (
+ "%IOTDB_CONF%\system.properties"') do (
set dn_rpc_port=%%i
)
) ELSE IF EXIST "%IOTDB_CONF%\iotdb-datanode.properties" (
@@ -52,9 +52,9 @@ IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
set dn_rpc_port=6667
)
-IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
+IF EXIST "%IOTDB_CONF%\system.properties" (
for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "^cn_internal_port"
- "%IOTDB_CONF%\iotdb-system.properties"') do (
+ "%IOTDB_CONF%\system.properties"') do (
set cn_internal_port=%%i
)
) ELSE IF EXIST "%IOTDB_CONF%\iotdb-confignode.properties" (
diff --git a/iotdb-client/cli/src/assembly/resources/tools/backup.sh
b/iotdb-client/cli/src/assembly/resources/tools/backup.sh
index d65392cdcca..057a0b91ff3 100644
--- a/iotdb-client/cli/src/assembly/resources/tools/backup.sh
+++ b/iotdb-client/cli/src/assembly/resources/tools/backup.sh
@@ -70,8 +70,8 @@ get_properties_value() {
local file_name=$1
local property_name=$2
local default_value=$3
- if [ -f "${IOTDB_HOME}/conf/iotdb-system.properties" ]; then
- local file_path="${IOTDB_HOME}/conf/iotdb-system.properties"
+ if [ -f "${IOTDB_HOME}/conf/system.properties" ]; then
+ local file_path="${IOTDB_HOME}/conf/system.properties"
else
local file_path="${IOTDB_HOME}/conf/${file_name}.properties"
fi
diff --git a/iotdb-client/cli/src/assembly/resources/tools/collect-info.bat
b/iotdb-client/cli/src/assembly/resources/tools/collect-info.bat
index 246228b9187..a3287a27ecf 100644
--- a/iotdb-client/cli/src/assembly/resources/tools/collect-info.bat
+++ b/iotdb-client/cli/src/assembly/resources/tools/collect-info.bat
@@ -46,8 +46,8 @@ set "passwd_param=root"
set "host_param=127.0.0.1"
set "port_param=6667"
-if exist "%IOTDB_HOME%\conf\iotdb-system.properties" (
- set "properties_file=%IOTDB_HOME%\conf\iotdb-system.properties"
+if exist "%IOTDB_HOME%\conf\system.properties" (
+ set "properties_file=%IOTDB_HOME%\conf\system.properties"
) else (
set "properties_file=%IOTDB_HOME%\conf\iotdb-datanode.properties"
)
diff --git a/iotdb-client/cli/src/assembly/resources/tools/collect-info.sh
b/iotdb-client/cli/src/assembly/resources/tools/collect-info.sh
index 1926309374a..2fb985f1b9c 100644
--- a/iotdb-client/cli/src/assembly/resources/tools/collect-info.sh
+++ b/iotdb-client/cli/src/assembly/resources/tools/collect-info.sh
@@ -85,8 +85,8 @@ choose_unit() {
echo "$unit"
}
-if [ -f "$IOTDB_HOME/conf/iotdb-system.properties" ]; then
- properties_file="$IOTDB_HOME/conf/iotdb-system.properties"
+if [ -f "$IOTDB_HOME/conf/system.properties" ]; then
+ properties_file="$IOTDB_HOME/conf/system.properties"
else
properties_file="$IOTDB_HOME/conf/iotdb-datanode.properties"
fi
diff --git
a/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh
b/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh
index e251f3939c2..66d8f213728 100644
--- a/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh
+++ b/iotdb-core/confignode/src/assembly/resources/conf/confignode-env.sh
@@ -166,8 +166,8 @@ get_cn_system_dir() {
fi
}
-if [ -f "${CONFIGNODE_CONF}/iotdb-system.properties" ]; then
- heap_dump_dir=$(get_cn_system_dir "iotdb-system.properties")
+if [ -f "${CONFIGNODE_CONF}/system.properties" ]; then
+ heap_dump_dir=$(get_cn_system_dir "system.properties")
else
heap_dump_dir=$(get_cn_system_dir "iotdb-confignode.properties")
fi
diff --git
a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat
b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat
index 40c5869549e..aef1b0d92e4 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.bat
@@ -84,10 +84,10 @@ IF EXIST "%CONFIGNODE_CONF%\confignode-env.bat" (
@REM CHECK THE PORT USAGES
@REM SET CONFIG FILE
-IF EXIST "%CONFIGNODE_CONF%\iotdb-system.properties" (
- set CONFIG_FILE="%CONFIGNODE_CONF%\iotdb-system.properties"
-) ELSE IF EXIST "%CONFIGNODE_HOME%\conf\iotdb-system.properties" (
- set CONFIG_FILE="%CONFIGNODE_HOME%\conf\iotdb-system.properties"
+IF EXIST "%CONFIGNODE_CONF%\system.properties" (
+ set CONFIG_FILE="%CONFIGNODE_CONF%\system.properties"
+) ELSE IF EXIST "%CONFIGNODE_HOME%\conf\system.properties" (
+ set CONFIG_FILE="%CONFIGNODE_HOME%\conf\system.properties"
) ELSE IF EXIST "%CONFIGNODE_CONF%\iotdb-confignode.properties" (
set CONFIG_FILE="%CONFIGNODE_CONF%\iotdb-confignode.properties"
) ELSE IF EXIST "%CONFIGNODE_HOME%\conf\iotdb-confignode.properties" (
@@ -106,7 +106,7 @@ IF DEFINED CONFIG_FILE (
set cn_consensus_port=%%i
)
) ELSE (
- echo "Can't find iotdb-system.properties or iotdb-confignode.properties,
check the default ports"
+ echo "Can't find system.properties or iotdb-confignode.properties, check the
default ports"
set cn_internal_port=10710
set cn_consensus_port=10720
)
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 3f3c9fccfcf..31ff033d301 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/start-confignode.sh
@@ -24,7 +24,7 @@ echo ----------------------------
-source "$(dirname "$0")/iotdb-common.sh"
+source "$(dirname "$0")/common.sh"
# iotdb server runs on foreground by default
foreground="yes"
diff --git
a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat
b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat
index 61abfe923b3..729bbd6fec5 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat
@@ -22,8 +22,8 @@
set current_dir=%~dp0
set superior_dir=%current_dir%\..\
-IF EXIST "%superior_dir%\conf\iotdb-system.properties" (
- set config_file="%superior_dir%\conf\iotdb-system.properties"
+IF EXIST "%superior_dir%\conf\system.properties" (
+ set config_file="%superior_dir%\conf\system.properties"
) ELSE (
IF EXIST "%superior_dir%\conf\iotdb-confignode.properties" (
set config_file="%superior_dir%\conf\iotdb-confignode.properties"
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 7152547dcaa..c595acf2d22 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
@@ -18,10 +18,10 @@
# under the License.
#
-source "$(dirname "$0")/iotdb-common.sh"
+source "$(dirname "$0")/common.sh"
CONFIGNODE_CONF="$(dirname "$0")/../conf"
-if [ -f "${CONFIGNODE_CONF}/iotdb-system.properties" ]; then
+if [ -f "${CONFIGNODE_CONF}/system.properties" ]; then
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:]]*$//')
diff --git a/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
b/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
index be64cce712b..367e08a962e 100755
--- a/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
+++ b/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
@@ -173,8 +173,8 @@ get_first_data_dir() {
fi
}
-if [ -f "${IOTDB_CONF}/iotdb-system.properties" ]; then
- heap_dump_dir=$(get_first_data_dir "iotdb-system.properties")
+if [ -f "${IOTDB_CONF}/system.properties" ]; then
+ heap_dump_dir=$(get_first_data_dir "system.properties")
else
heap_dump_dir=$(get_first_data_dir "iotdb-datanode.properties")
fi
diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat
b/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat
index c80aaf6f551..bcb580097de 100755
--- a/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.bat
@@ -103,10 +103,10 @@ IF EXIST "%IOTDB_CONF%\datanode-env.bat" (
)
@REM SET CONFIG FILE
-IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
- set CONFIG_FILE="%IOTDB_CONF%\iotdb-system.properties"
-) ELSE IF EXIST "%IOTDB_HOME%\conf\iotdb-system.properties" (
- set CONFIG_FILE="%IOTDB_HOME%\conf\iotdb-system.properties"
+IF EXIST "%IOTDB_CONF%\system.properties" (
+ set CONFIG_FILE="%IOTDB_CONF%\system.properties"
+) ELSE IF EXIST "%IOTDB_HOME%\conf\system.properties" (
+ set CONFIG_FILE="%IOTDB_HOME%\conf\system.properties"
) ELSE IF EXIST "%IOTDB_CONF%\iotdb-datanode.properties" (
set CONFIG_FILE="%IOTDB_CONF%\iotdb-datanode.properties"
) ELSE IF EXIST "%IOTDB_HOME%\conf\iotdb-datanode.properties" (
@@ -138,7 +138,7 @@ IF DEFINED CONFIG_FILE (
set dn_data_region_consensus_port=%%i
)
) ELSE (
- echo "Can't find iotdb-system.properties or iotdb-datanode.properties, check
the default ports"
+ echo "Can't find system.properties or iotdb-datanode.properties, check the
default ports"
set dn_rpc_port=6667
set dn_internal_port=10730
set dn_mpp_data_exchange_port=10740
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 a89ca80f591..fdbca935592 100755
--- a/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.sh
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/start-datanode.sh
@@ -19,7 +19,7 @@
#
-source "$(dirname "$0")/iotdb-common.sh"
+source "$(dirname "$0")/common.sh"
# iotdb server runs on foreground by default
foreground="yes"
diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat
b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat
index 9910807018d..f79bb41252d 100644
--- a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat
@@ -22,8 +22,8 @@
set current_dir=%~dp0
set superior_dir=%current_dir%\..\
-IF EXIST "%superior_dir%\conf\iotdb-system.properties" (
- set config_file="%superior_dir%\conf\iotdb-system.properties"
+IF EXIST "%superior_dir%\conf\system.properties" (
+ set config_file="%superior_dir%\conf\system.properties"
) ELSE (
IF EXIST "%superior_dir%\conf\iotdb-datanode.properties" (
set config_file=%superior_dir%\conf\iotdb-datanode.properties
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 af56d39a6cd..0fd94e640e5 100644
--- a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
@@ -18,10 +18,10 @@
# under the License.
#
-source "$(dirname "$0")/iotdb-common.sh"
+source "$(dirname "$0")/common.sh"
DATANODE_CONF="`dirname "$0"`/../conf"
-if [ -f "${DATANODE_CONF}/iotdb-system.properties" ]; then
+if [ -f "${DATANODE_CONF}/system.properties" ]; then
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:]]*$//')
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 a7088920637..e45f9c9d109 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Starting Sketching the IoTDB SchemaFile
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 8110aabb9fd..da813e4db33 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Starting Parsing the IoTDB Mlog or Snapshot
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 0d1b60d014e..4309895cd69 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Starting Validating the TsFile resources
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 aa326403c34..f1f5962ec3f 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Starting Validating the TsFile
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 b55129a28e8..303e17de314 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Starting Printing the IoTDB Data Directory Overview
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 521dbb7f423..f5ded50f256 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
@@ -23,7 +23,7 @@ echo ---------------------
echo Starting Printing the TsFileResources
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 15e35fad95b..f0c8918fd16 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Starting Printing the TsFile Sketch
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 154a3bb4453..8cea2ff323f 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Start Splitting TsFile
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
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 f7d1c2be078..76874bd68e9 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
@@ -22,7 +22,7 @@ echo ---------------------
echo Starting Validating the TsFile
echo ---------------------
-source "$(dirname "$0")/../../sbin/iotdb-common.sh"
+source "$(dirname "$0")/../../sbin/common.sh"
#get_iotdb_include and checkAllVariables is in common.sh
VARS=$(get_iotdb_include "$*")
checkAllVariables
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
index c0ba3fca366..a6815b174a4 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
@@ -236,11 +236,11 @@ public class IoTDBStartCheck {
+ " Please upgrade to v0.10 first");
System.exit(-1);
}
- String versionString = properties.getProperty(IOTDB_VERSION_STRING);
- if (versionString.startsWith("0.")) {
- logger.error("IoTDB version is too old");
- System.exit(-1);
- }
+ // String versionString =
properties.getProperty(IOTDB_VERSION_STRING);
+ // if (versionString.startsWith("0.")) {
+ // logger.error("IoTDB version is too old");
+ // System.exit(-1);
+ // }
checkImmutableSystemProperties();
}
}
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 6f0d9cb5e0b..796d420e442 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
@@ -192,8 +192,8 @@ public class DataNode extends ServerCommandLine implements
DataNodeMBean {
}
public static void main(String[] args) {
- logger.info("IoTDB-DataNode environment variables: {}",
IoTDBConfig.getEnvironmentVariables());
- logger.info("IoTDB-DataNode default charset is: {}",
Charset.defaultCharset().displayName());
+ logger.info("DataNode environment variables: {}",
IoTDBConfig.getEnvironmentVariables());
+ logger.info("DataNode default charset is: {}",
Charset.defaultCharset().displayName());
DataNode dataNode = new DataNode();
int returnCode = dataNode.run(args);
if (returnCode != 0) {
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ConfigurationFileUtilsTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ConfigurationFileUtilsTest.java
index 89ef66db385..7def7f8118c 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ConfigurationFileUtilsTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/ConfigurationFileUtilsTest.java
@@ -55,7 +55,7 @@ public class ConfigurationFileUtilsTest {
File confignodeConfigFile = new File(dir + File.separator +
"iotdb-confignode.properties");
File datanodeConfigFile = new File(dir + File.separator +
"iotdb-datanode.properties");
File commonConfigFile = new File(dir + File.separator +
"iotdb-common.properties");
- File systemConfigFile = new File(dir + File.separator +
"iotdb-system.properties");
+ File systemConfigFile = new File(dir + File.separator +
"system.properties");
generateFile(confignodeConfigFile, "a=1");
generateFile(datanodeConfigFile, "b=2");
generateFile(commonConfigFile, "c=3");
diff --git a/iotdb-core/node-commons/src/assembly/resources/sbin/common.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/common.sh
index 624338e0602..2eceb4d2858 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/common.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/common.sh
@@ -168,13 +168,13 @@ checkDataNodePortUsages () {
echo "Warning: If you do not use sudo, the checking may not detect all the
occupied ports."
fi
occupied=false
- if [ -f "$IOTDB_CONF/iotdb-system.properties" ]; then
+ if [ -f "$IOTDB_CONF/system.properties" ]; then
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
+ elif [ -f "$IOTDB_HOME/conf/system.properties" ]; then
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)
@@ -193,7 +193,7 @@ checkDataNodePortUsages () {
dn_schema_region_consensus_port=$(sed
'/^dn_schema_region_consensus_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-datanode.properties)
dn_data_region_consensus_port=$(sed
'/^dn_data_region_consensus_port=/!d;s/.*=//'
"${IOTDB_CONF}"/iotdb-datanode.properties)
else
- echo "Warning: cannot find iotdb-system.properties or
iotdb-datanode.properties, check the default configuration"
+ echo "Warning: cannot find system.properties or iotdb-datanode.properties,
check the default configuration"
fi
check_config_unique "dn_rpc_port" "$dn_rpc_port"
@@ -275,10 +275,10 @@ checkConfigNodePortUsages () {
echo "Warning: If you do not use sudo, the checking may not detect all the
occupied ports."
fi
occupied=false
- if [ -f "$CONFIGNODE_CONF/iotdb-system.properties" ]; then
+ if [ -f "$CONFIGNODE_CONF/system.properties" ]; then
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
+ elif [ -f "$CONFIGNODE_HOME/conf/system.properties" ]; then
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
@@ -288,7 +288,7 @@ checkConfigNodePortUsages () {
cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_HOME}"/conf/iotdb-confignode.properties)
cn_consensus_port=$(sed '/^cn_consensus_port=/!d;s/.*=//'
"${CONFIGNODE_HOME}"/conf/iotdb-confignode.properties)
else
- echo "Cannot find iotdb-system.properties or iotdb-confignode.properties,
check the default configuration"
+ echo "Cannot find system.properties or iotdb-confignode.properties, check
the default configuration"
fi
check_config_unique "cn_internal_port" "$cn_internal_port"
diff --git
a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat
b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat
index 0fd3bd5d994..e044be59e05 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.bat
@@ -35,8 +35,8 @@ if not "%CLEAN_SERVICE%"=="y" if not "%CLEAN_SERVICE%"=="Y" (
start cmd /c "%IOTDB_HOME%\\sbin\\stop-confignode.bat -f"
timeout /t 3 > nul
rmdir /s /q "%IOTDB_HOME%\data\confignode\" 2>nul
-if exist "%IOTDB_HOME%\conf\iotdb-system.properties" (
- set IOTDB_CONFIGNODE_CONFIG="%IOTDB_HOME%\conf\iotdb-system.properties"
+if exist "%IOTDB_HOME%\conf\system.properties" (
+ set IOTDB_CONFIGNODE_CONFIG="%IOTDB_HOME%\conf\system.properties"
) ELSE (
set IOTDB_CONFIGNODE_CONFIG="%IOTDB_HOME%\conf\iotdb-confignode.properties"
)
diff --git
a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.sh
index fee89699362..4ac6c731905 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-confignode.sh
@@ -33,8 +33,8 @@ fi
nohup bash ${IOTDB_HOME}/sbin/stop-confignode.sh -f >/dev/null 2>&1 &
rm -rf ${IOTDB_HOME}/data/confignode/ >/dev/null 2>&1 &
-if [ -f "${IOTDB_HOME}/conf/iotdb-system.properties" ]; then
- IOTDB_CONFIGNODE_CONFIG="${IOTDB_HOME}/conf/iotdb-system.properties"
+if [ -f "${IOTDB_HOME}/conf/system.properties" ]; then
+ IOTDB_CONFIGNODE_CONFIG="${IOTDB_HOME}/conf/system.properties"
else
IOTDB_CONFIGNODE_CONFIG="${IOTDB_HOME}/conf/iotdb-confignode.properties"
fi
diff --git
a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat
b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat
index b64cd00dc49..ae114d5abdd 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.bat
@@ -34,8 +34,8 @@ if not "%CLEAN_SERVICE%"=="y" if not "%CLEAN_SERVICE%"=="Y" (
start cmd /c "%IOTDB_HOME%\\sbin\\stop-datanode.bat -f"
timeout /t 3 > nul
rmdir /s /q "%IOTDB_HOME%\data\datanode\" 2>nul
-if exist "%IOTDB_HOME%\conf\iotdb-system.properties" (
- set IOTDB_DATANODE_CONFIG="%IOTDB_HOME%\conf\iotdb-system.properties"
+if exist "%IOTDB_HOME%\conf\system.properties" (
+ set IOTDB_DATANODE_CONFIG="%IOTDB_HOME%\conf\system.properties"
) ELSE (
set IOTDB_DATANODE_CONFIG="%IOTDB_HOME%\conf\iotdb-datanode.properties"
)
diff --git
a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.sh
index 1e8c74d62d7..66229ce4630 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/destroy-datanode.sh
@@ -33,8 +33,8 @@ nohup bash ${IOTDB_HOME}/sbin/stop-datanode.sh -f >/dev/null
2>&1 &
rm -rf ${IOTDB_HOME}/data/datanode/ >/dev/null 2>&1 &
-if [ -f "${IOTDB_HOME}/conf/iotdb-system.properties" ]; then
- IOTDB_DATANODE_CONFIG="${IOTDB_HOME}/conf/iotdb-system.properties"
+if [ -f "${IOTDB_HOME}/conf/system.properties" ]; then
+ IOTDB_DATANODE_CONFIG="${IOTDB_HOME}/conf/system.properties"
else
IOTDB_DATANODE_CONFIG="${IOTDB_HOME}/conf/iotdb-datanode.properties"
fi
diff --git
a/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.bat
b/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.bat
index 19c40f3974e..adfe9d4f66f 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.bat
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.bat
@@ -230,8 +230,8 @@ exit /b
:local_dirs_check
setlocal enabledelayedexpansion
-if exist "%IOTDB_HOME%\conf\iotdb-system.properties" (
- set "properties_file=%IOTDB_HOME%\conf\iotdb-system.properties"
+if exist "%IOTDB_HOME%\conf\system.properties" (
+ set "properties_file=%IOTDB_HOME%\conf\system.properties"
) ELSE (
set "properties_file=%IOTDB_HOME%\conf\iotdb-datanode.properties"
)
@@ -352,11 +352,11 @@ if defined operation_dirs (
exit /b
:local_ports_check
-IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
- set DATANODE_CONFIG_FILE_PATH="%IOTDB_CONF%\iotdb-system.properties"
-) ELSE IF EXIST "%IOTDB_HOME%\conf\iotdb-system.properties" (
- set DATANODE_CONFIG_FILE_PATH="%IOTDB_HOME%\conf\iotdb-system.properties"
-) ELSE IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
+IF EXIST "%IOTDB_CONF%\system.properties" (
+ set DATANODE_CONFIG_FILE_PATH="%IOTDB_CONF%\system.properties"
+) ELSE IF EXIST "%IOTDB_HOME%\conf\system.properties" (
+ set DATANODE_CONFIG_FILE_PATH="%IOTDB_HOME%\conf\system.properties"
+) ELSE IF EXIST "%IOTDB_CONF%\system.properties" (
set DATANODE_CONFIG_FILE_PATH="%IOTDB_CONF%\iotdb-datanode.properties"
) ELSE IF EXIST "%IOTDB_HOME%\conf\iotdb-datanode.properties" (
set DATANODE_CONFIG_FILE_PATH="%IOTDB_HOME%\conf\iotdb-datanode.properties"
@@ -392,11 +392,11 @@ IF DEFINED DATANODE_CONFIG_FILE_PATH (
set dn_data_region_consensus_port=10760
)
-IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
- set CONFIGNODE_CONFIG_FILE_PATH="%IOTDB_CONF%\iotdb-system.properties"
-) ELSE IF EXIST "%IOTDB_HOME%\conf\iotdb-system.properties" (
- set CONFIGNODE_CONFIG_FILE_PATH="%IOTDB_HOME%\conf\iotdb-system.properties"
-) ELSE IF EXIST "%IOTDB_CONF%\iotdb-system.properties" (
+IF EXIST "%IOTDB_CONF%\system.properties" (
+ set CONFIGNODE_CONFIG_FILE_PATH="%IOTDB_CONF%\system.properties"
+) ELSE IF EXIST "%IOTDB_HOME%\conf\system.properties" (
+ set CONFIGNODE_CONFIG_FILE_PATH="%IOTDB_HOME%\conf\system.properties"
+) ELSE IF EXIST "%IOTDB_CONF%\system.properties" (
set CONFIGNODE_CONFIG_FILE_PATH="%IOTDB_CONF%\iotdb-confignode.properties"
) ELSE IF EXIST "%IOTDB_HOME%\conf\iotdb-confignode.properties" (
set
CONFIGNODE_CONFIG_FILE_PATH="%IOTDB_HOME%\conf\iotdb-confignode.properties"
diff --git
a/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.sh
b/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.sh
index 9cb08bb5e33..6e9c878024e 100644
--- a/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.sh
+++ b/iotdb-core/node-commons/src/assembly/resources/sbin/health_check.sh
@@ -31,7 +31,7 @@ system_settings_pre_check(){
ulimit_value=$(ulimit -n)
}
-source "${IOTDB_HOME}/sbin/iotdb-common.sh"
+source "${IOTDB_HOME}/sbin/common.sh"
HELP="Usage: $0 [-ips <ip1> <port1> <port2>,<ip2> <port3> <port4>] [-o
<all/local/remote>]"
@@ -170,8 +170,8 @@ get_properties_value() {
local file_name=$1
local property_name=$2
local default_value=$3
- if [ -f "${IOTDB_HOME}/conf/iotdb-system.properties" ]; then
- local file_path="${IOTDB_HOME}/conf/iotdb-system.properties"
+ if [ -f "${IOTDB_HOME}/conf/system.properties" ]; then
+ local file_path="${IOTDB_HOME}/conf/system.properties"
else
local file_path="${IOTDB_HOME}/conf/${file_name}.properties"
fi
