This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new c792db04207 Trim port in stop scripts & data dir (#15134)
c792db04207 is described below
commit c792db04207cfa7d0977c61cc90f9d3c57b15e01
Author: Jiang Tian <[email protected]>
AuthorDate: Wed Mar 19 20:44:40 2025 +0800
Trim port in stop scripts & data dir (#15134)
---
.../assembly/resources/sbin/stop-confignode.bat | 25 ++++++++++++----------
.../src/assembly/resources/sbin/stop-confignode.sh | 4 ++++
.../src/assembly/resources/conf/datanode-env.sh | 3 +++
.../src/assembly/resources/sbin/stop-datanode.bat | 23 ++++++++++----------
.../src/assembly/resources/sbin/stop-datanode.sh | 4 ++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 +++
6 files changed, 40 insertions(+), 22 deletions(-)
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 b728e400fbc..61abfe923b3 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.bat
@@ -37,6 +37,18 @@ for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i
"^cn_internal_port"
"%config_file%"') do (
set cn_internal_port=%%i
)
+@REM trim the port
+:delLeft1
+if "%cn_internal_port:~0,1%"==" " (
+ set "cn_internal_port=%cn_internal_port:~1%"
+ goto delLeft1
+)
+
+:delRight1
+if "%cn_internal_port:~-1%"==" " (
+ set "cn_internal_port=%cn_internal_port:~0,-1%"
+ goto delRight1
+)
if not defined cn_internal_port (
echo "WARNING: cn_internal_port not found in the configuration file. Using
default value cn_internal_port = 10710"
@@ -45,17 +57,8 @@ if not defined cn_internal_port (
echo "check whether the cn_internal_port is used..., port is
%cn_internal_port%"
-for /f "eol=; tokens=2,2 delims==" %%i in ('findstr /i "cn_internal_address"
-"%config_file%"') do (
- set cn_internal_address=%%i
-)
-
-if not defined cn_internal_address (
- echo "WARNING: cn_internal_address not found in the configuration file.
Using default value cn_internal_address = 127.0.0.1"
- set cn_internal_address=127.0.0.1
-)
-
-for /f "tokens=5" %%a in ('netstat /ano ^| findstr
%cn_internal_address%:%cn_internal_port% ^| findstr LISTENING ') do (
+echo %cn_internal_address%:%cn_internal_port%;
+for /f "tokens=5" %%a in ('netstat /ano ^| findstr :%cn_internal_port% ^|
findstr LISTENING ') do (
taskkill /f /pid %%a
echo "close ConfigNode, PID:" %%a
)
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 f3207380dbd..dfc214865a7 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/stop-confignode.sh
@@ -23,8 +23,12 @@ 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)
+ # trim the port
+ cn_internal_port=$(echo "$cn_internal_port" | sed -e 's/^[[:space:]]*//'
-e 's/[[:space:]]*$//')
else
cn_internal_port=$(sed '/^cn_internal_port=/!d;s/.*=//'
"${CONFIGNODE_CONF}"/iotdb-confignode.properties)
+ # trim the port
+ cn_internal_port=$(echo "$cn_internal_port" | sed -e 's/^[[:space:]]*//'
-e 's/[[:space:]]*$//')
fi
if [ -z "$cn_internal_port" ]; then
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 b1f3c687326..e9e59f43405 100755
--- a/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
+++ b/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh
@@ -162,6 +162,9 @@ get_first_data_dir() {
data_dir_value=$(echo "$data_dir_value" | cut -d',' -f1)
fi
+ # trim the dir
+ data_dir_value=$(echo "$data_dir_value" | sed -e 's/^[[:space:]]*//' -e
's/[[:space:]]*$//')
+
if [[ "$data_dir_value" == /* ]]; then
echo "$data_dir_value"
else
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 251243e4c1e..9910807018d 100644
--- a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.bat
@@ -42,6 +42,17 @@ for /f "eol=# tokens=2 delims==" %%i in ('findstr /i
"^dn_rpc_port"
"%config_file%"') do (
set dn_rpc_port=%%i
)
+@REM trim the port
+:delLeft1
+if "%dn_rpc_port:~0,1%"==" " (
+ set "dn_rpc_port=%dn_rpc_port:~1%"
+ goto delLeft1
+)
+:delRight1
+if "%dn_rpc_port:~-1%"==" " (
+ set "dn_rpc_port=%dn_rpc_port:~0,-1%"
+ goto delRight1
+)
if not defined dn_rpc_port (
echo "WARNING: dn_rpc_port not found in the configuration file. Using
default value dn_rpc_port = 6667"
@@ -50,17 +61,7 @@ if not defined dn_rpc_port (
echo Check whether the rpc_port is used..., port is %dn_rpc_port%
-for /f "eol=# tokens=2 delims==" %%i in ('findstr /i "dn_rpc_address"
-"%config_file%"') do (
- set dn_rpc_address=%%i
-)
-
-if not defined dn_rpc_address (
- echo "WARNING: dn_rpc_address not found in the configuration file. Using
default value dn_rpc_address = 0.0.0.0"
- set dn_rpc_address=0.0.0.0
-)
-
-for /f "tokens=5" %%a in ('netstat /ano ^| findstr
%dn_rpc_address%:%dn_rpc_port%') do (
+for /f "tokens=5" %%a in ('netstat /ano ^| findstr :%dn_rpc_port% ') do (
taskkill /f /pid %%a
echo Close DataNode, PID: %%a
)
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 430367ec708..1f6711cfa93 100644
--- a/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/stop-datanode.sh
@@ -23,8 +23,12 @@ 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`
+ # trim the port
+ dn_rpc_port=$(echo "$dn_rpc_port" | sed -e 's/^[[:space:]]*//' -e
's/[[:space:]]*$//')
else
dn_rpc_port=`sed '/^dn_rpc_port=/!d;s/.*=//'
${DATANODE_CONF}/iotdb-datanode.properties`
+ # trim the port
+ dn_rpc_port=$(echo "$dn_rpc_port" | sed -e 's/^[[:space:]]*//' -e
's/[[:space:]]*$//')
fi
if [ -z "$dn_rpc_port" ]; then
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 9bf9d893dfa..96c4bacb44b 100755
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -1893,6 +1893,9 @@ public class IoTDBDescriptor {
String[][] tierDataDirs = new String[tiers.length][];
for (int i = 0; i < tiers.length; ++i) {
tierDataDirs[i] = tiers[i].split(",");
+ for (int j = 0; j < tierDataDirs[i].length; j++) {
+ tierDataDirs[i][j] = tierDataDirs[i][j].trim();
+ }
}
return tierDataDirs;
}
