This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 37c312d5c15 Delete remove-confignode.sh and remove-datanode.sh (#14855)
37c312d5c15 is described below
commit 37c312d5c15284583a250287617ead30ac27d686
Author: Xiangpeng Hu <[email protected]>
AuthorDate: Sat Feb 15 19:22:59 2025 +0800
Delete remove-confignode.sh and remove-datanode.sh (#14855)
(cherry picked from commit 3edb24fe96cbe217222e3c3dee9a4d06e5643312)
---
.../assembly/resources/sbin/remove-confignode.bat | 135 -------------------
.../assembly/resources/sbin/remove-confignode.sh | 69 ----------
.../confignode/conf/ConfigNodeRemoveCheck.java | 5 +-
.../assembly/resources/sbin/remove-datanode.bat | 148 ---------------------
.../src/assembly/resources/sbin/remove-datanode.sh | 91 -------------
5 files changed, 1 insertion(+), 447 deletions(-)
diff --git
a/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.bat
b/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.bat
deleted file mode 100644
index ade8036fb92..00000000000
--- a/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.bat
+++ /dev/null
@@ -1,135 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM
-
-@echo off
-
-IF "%~1"=="--help" (
- echo The script will remove a ConfigNode.
- echo Before removing a ConfigNode, ensure that there is at least one
active ConfigNode in the cluster after the removal.
- echo Usage:
- echo Remove the ConfigNode with confignode_id
- echo ./sbin/remove-confignode.bat [confignode_id]
- EXIT /B 0
-)
-
-echo ```````````````````````````
-echo Starting to remove IoTDB ConfigNode
-echo ```````````````````````````
-
-
-set PATH="%JAVA_HOME%\bin\";%PATH%
-set "FULL_VERSION="
-set "MAJOR_VERSION="
-set "MINOR_VERSION="
-
-
-for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java -fullversion 2^>^&1') do (
- set "FULL_VERSION=%%j-%%k-%%l-%%m"
- IF "%%j" == "1" (
- set "MAJOR_VERSION=%%k"
- set "MINOR_VERSION=%%l"
- ) else (
- set "MAJOR_VERSION=%%j"
- set "MINOR_VERSION=%%k"
- )
-)
-
-set JAVA_VERSION=%MAJOR_VERSION%
-
-@REM we do not check jdk that version less than 1.8 because they are too
stale...
-IF "%JAVA_VERSION%" == "6" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
-IF "%JAVA_VERSION%" == "7" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
-
-if "%OS%" == "Windows_NT" setlocal
-
-pushd %~dp0..
-if NOT DEFINED CONFIGNODE_HOME set CONFIGNODE_HOME=%cd%
-popd
-
-set CONFIGNODE_CONF=%CONFIGNODE_HOME%\conf
-set CONFIGNODE_LOGS=%CONFIGNODE_HOME%\logs
-
-@setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS
-set CONF_PARAMS=-r
-set is_conf_path=false
-for %%i in (%*) do (
- IF "%%i" == "-c" (
- set is_conf_path=true
- ) ELSE IF "!is_conf_path!" == "true" (
- set is_conf_path=false
- set IOTDB_CONF=%%i
- ) ELSE (
- set CONF_PARAMS=!CONF_PARAMS! %%i
- )
-)
-
-IF EXIST "%CONFIGNODE_CONF%\confignode-env.bat" (
- CALL "%CONFIGNODE_CONF%\confignode-env.bat" %1
- ) ELSE (
- echo "can't find %CONFIGNODE_CONF%\confignode-env.bat"
- )
-
-if NOT DEFINED MAIN_CLASS set
MAIN_CLASS=org.apache.iotdb.confignode.service.ConfigNode
-if NOT DEFINED JAVA_HOME goto :err
-
-@REM
-----------------------------------------------------------------------------
-@REM JVM Opts we'll use in legacy run or installation
-set JAVA_OPTS=-ea^
- -Dlogback.configurationFile="%CONFIGNODE_CONF%\logback-confignode.xml"^
- -DCONFIGNODE_HOME="%CONFIGNODE_HOME%"^
- -DCONFIGNODE_CONF="%CONFIGNODE_CONF%"^
- -Dsun.jnu.encoding=UTF-8^
- -Dfile.encoding=UTF-8
-
-@REM ***** CLASSPATH library setting *****
-@REM Ensure that any user defined CLASSPATH variables are not used on startup
-if EXIST "%CONFIGNODE_HOME%\lib" (set CLASSPATH="%CONFIGNODE_HOME%\lib\*")
else set CLASSPATH="%CONFIGNODE_HOME%\..\lib\*"
-set CLASSPATH=%CLASSPATH%;iotdb.ConfigNode
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-
-goto :eof
-
-@REM
-----------------------------------------------------------------------------
-:okClasspath
-
-rem echo CLASSPATH: %CLASSPATH%
-
-"%JAVA_HOME%\bin\java" %ILLEGAL_ACCESS_PARAMS% %JAVA_OPTS%
%CONFIGNODE_HEAP_OPTS% -cp %CLASSPATH% %CONFIGNODE_JMX_OPTS% %MAIN_CLASS%
%CONF_PARAMS%
-goto finally
-
-:err
-echo JAVA_HOME environment variable must be set!
-pause
-
-
-@REM
-----------------------------------------------------------------------------
-:finally
-
-pause
-
-ENDLOCAL
diff --git
a/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.sh
b/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.sh
deleted file mode 100755
index 320aa5e857f..00000000000
--- a/iotdb-core/confignode/src/assembly/resources/sbin/remove-confignode.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-if [ "$#" -eq 1 ] && [ "$1" == "--help" ]; then
- echo "The script will remove a ConfigNode."
- echo "Before removing a ConfigNode, ensure that there is at least one
active ConfigNode in the cluster after the removal."
- echo "Usage:"
- echo "Remove the ConfigNode with confignode_id"
- echo "./sbin/remove-confignode.sh [confignode_id]"
- exit 0
-fi
-
-echo ----------------------------
-echo Starting to remove IoTDB ConfigNode
-echo ----------------------------
-
-source "$(dirname "$0")/iotdb-common.sh"
-
-#get_iotdb_include wil remove -D parameters
-VARS=$(get_iotdb_include "$*")
-checkAllConfigNodeVariables
-eval set -- "$VARS"
-
-PARAMS="-r "$*
-
-initConfigNodeEnv
-
-CLASSPATH=""
-for f in ${CONFIGNODE_HOME}/lib/*.jar; do
- CLASSPATH=${CLASSPATH}":"$f
-done
-classname=org.apache.iotdb.confignode.service.ConfigNode
-
-launch_service() {
- class="$1"
- iotdb_parms="-Dlogback.configurationFile=${CONFIGNODE_LOG_CONFIG}"
- iotdb_parms="$iotdb_parms -DCONFIGNODE_HOME=${CONFIGNODE_HOME}"
- iotdb_parms="$iotdb_parms
-DCONFIGNODE_DATA_HOME=${CONFIGNODE_DATA_HOME}"
- iotdb_parms="$iotdb_parms -DTSFILE_HOME=${CONFIGNODE_HOME}"
- iotdb_parms="$iotdb_parms -DCONFIGNODE_CONF=${CONFIGNODE_CONF}"
- iotdb_parms="$iotdb_parms -DTSFILE_CONF=${CONFIGNODE_CONF}"
- iotdb_parms="$iotdb_parms -Dname=iotdb\.ConfigNode"
- iotdb_parms="$iotdb_parms -DCONFIGNODE_LOGS=${CONFIGNODE_LOGS}"
-
- exec "$JAVA" $illegal_access_params $iotdb_parms $IOTDB_JMX_OPTS -cp
"$CLASSPATH" "$class" $PARAMS
- return $?
-}
-
-# Start up the service
-launch_service "$classname"
-
-exit $?
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
index 9c4c480b02c..b8475643ba2 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
@@ -83,10 +83,7 @@ public class ConfigNodeRemoveCheck {
.findFirst()
.orElse(null);
} catch (BadNodeUrlException e) {
- LOGGER.info(
- "Usage: remove-confignode.sh <confignode-id> "
- + "or remove-confignode.sh
<internal_address>:<internal_port>",
- e);
+ LOGGER.info("Use SQL: remove confignode <confignode-id>; ", e);
return nodeLocation;
}
}
diff --git
a/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.bat
b/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.bat
deleted file mode 100644
index 2202dbadb8f..00000000000
--- a/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.bat
+++ /dev/null
@@ -1,148 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM
-
-@echo off
-
-IF "%~1"=="--help" (
- echo The script will remove one or more DataNodes.
- echo Before removing DataNodes, ensure that the cluster has at least the
required number of data/schema replicas DataNodes.
- echo Usage: ./sbin/remove-datanode.sh [DataNode_ID ...]
- echo Remove one or more DataNodes by specifying their IDs.
- echo Note that this datanode is removed by default if DataNode_ID is not
specified.
- echo Example:
- echo ./sbin/remove-datanode.sh 1 # Remove DataNode with ID 1
- echo ./sbin/remove-datanode.sh 1 2 3 # Remove DataNodes with IDs 1,
2, and 3
- EXIT /B 0
-)
-
-REM Check for duplicate DataNode IDs
-set "ids=%*"
-set "unique_ids="
-for %%i in (%ids%) do (
- if "!unique_ids!" == "" (
- set "unique_ids=%%i"
- ) else (
- echo !unique_ids! | findstr /b /c:"%%i " >nul
- if errorlevel 1 (
- set "unique_ids=!unique_ids! %%i"
- ) else (
- echo Error: Duplicate DataNode ID %%i found.
- EXIT /B 1
- )
- )
-)
-
-echo -------------------------
-echo Starting to remove DataNodes: %ids%
-echo -------------------------
-
-PATH %PATH%;%JAVA_HOME%\bin\
-set "FULL_VERSION="
-set "MAJOR_VERSION="
-set "MINOR_VERSION="
-
-
-for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java -fullversion 2^>^&1') do (
- set "FULL_VERSION=%%j-%%k-%%l-%%m"
- IF "%%j" == "1" (
- set "MAJOR_VERSION=%%k"
- set "MINOR_VERSION=%%l"
- ) else (
- set "MAJOR_VERSION=%%j"
- set "MINOR_VERSION=%%k"
- )
-)
-
-set JAVA_VERSION=%MAJOR_VERSION%
-
-IF "%JAVA_VERSION%" == "6" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
-IF "%JAVA_VERSION%" == "7" (
- echo IoTDB only supports jdk >= 8, please check your java version.
- goto finally
-)
-
-if "%OS%" == "Windows_NT" setlocal
-
-pushd %~dp0..
-if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%cd%
-popd
-
-set IOTDB_CONF=%IOTDB_HOME%\conf
-set IOTDB_LOGS=%IOTDB_HOME%\logs
-
-@setlocal ENABLEDELAYEDEXPANSION ENABLEEXTENSIONS
-set CONF_PARAMS=-r
-set is_conf_path=false
-for %%i in (%unique_ids%) do (
- set CONF_PARAMS=!CONF_PARAMS! %%i
-)
-
-if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.service.DataNode
-if NOT DEFINED JAVA_HOME goto :err
-
-@REM
-----------------------------------------------------------------------------
-@REM JVM Opts we'll use in legacy run or installation
-set JAVA_OPTS=-ea^
- -Dlogback.configurationFile="%IOTDB_CONF%\logback-datanode.xml"^
- -DIOTDB_HOME="%IOTDB_HOME%"^
- -DTSFILE_HOME="%IOTDB_HOME%"^
- -DIOTDB_CONF="%IOTDB_CONF%"
-
-@REM ***** CLASSPATH library setting *****
-@REM Ensure that any user defined CLASSPATH variables are not used on startup
-if EXIST "%IOTDB_HOME%\lib" (set CLASSPATH="%IOTDB_HOME%\lib\*") else set
CLASSPATH="%IOTDB_HOME%\..\lib\*"
-
-@REM For each jar in the IOTDB_HOME lib directory call append to build the
CLASSPATH variable.
-set CLASSPATH=%CLASSPATH%;"%IOTDB_HOME%\lib\*"
-set CLASSPATH=%CLASSPATH%;iotdb.db.service.DataNode
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-@REM
-----------------------------------------------------------------------------
-:okClasspath
-
-rem echo CLASSPATH: %CLASSPATH%
-
-@REM In case the 2g memory is not enough in some scenarios, users can further
reduce the memory usage manually.
-@REM on heap memory size
-set ON_HEAP_MEMORY=2G
-
-@REM off heap memory size
-set OFF_HEAP_MEMORY=512M
-
-"%JAVA_HOME%\bin\java" %ILLEGAL_ACCESS_PARAMS% %JAVA_OPTS% %IOTDB_HEAP_OPTS%
-Xms%ON_HEAP_MEMORY% -Xmx%ON_HEAP_MEMORY%
-XX:MaxDirectMemorySize=%OFF_HEAP_MEMORY% -cp %CLASSPATH% %IOTDB_JMX_OPTS%
%MAIN_CLASS% %CONF_PARAMS%
-goto finally
-
-:err
-echo JAVA_HOME environment variable must be set!
-pause
-
-
-@REM
-----------------------------------------------------------------------------
-:finally
-
-pause
-
-ENDLOCAL
diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.sh
b/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.sh
deleted file mode 100755
index 415aea8bb2e..00000000000
--- a/iotdb-core/datanode/src/assembly/resources/sbin/remove-datanode.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-if [ "$#" -eq 1 ] && [ "$1" == "--help" ]; then
- echo "The script will remove one or more DataNodes."
- echo "Before removing DataNodes, ensure that the cluster has at least the
required number of data/schema replicas DataNodes."
- echo "Usage: ./sbin/remove-datanode.sh [DataNode_ID ...]"
- echo "Remove one or more DataNodes by specifying their IDs."
- echo "Note that this datanode is removed by default if DataNode_ID is not
specified."
- echo "Example:"
- echo " ./sbin/remove-datanode.sh 1 # Remove DataNode with ID 1"
- echo " ./sbin/remove-datanode.sh 1 2 3 # Remove DataNodes with IDs 1,
2, and 3"
- exit 0
-fi
-
-# Check for duplicate DataNode IDs
-ids=("$@")
-unique_ids=($(printf "%s\n" "${ids[@]}" | sort -u))
-if [ "${#ids[@]}" -ne "${#unique_ids[@]}" ]; then
- echo "Error: Duplicate DataNode IDs found."
- exit 1
-fi
-
-echo ---------------------
-echo "Starting to remove DataNodes: ${ids[*]}"
-echo ---------------------
-
-source "$(dirname "$0")/iotdb-common.sh"
-
-#get_iotdb_include will remove -D parameters
-VARS=$(get_iotdb_include "$*")
-checkAllVariables
-eval set -- "$VARS"
-
-PARAMS="-r "$*
-
-#initEnv is in iotdb-common.sh
-initEnv
-
-CLASSPATH=""
-for f in ${IOTDB_HOME}/lib/*.jar; do
- CLASSPATH=${CLASSPATH}":"$f
-done
-
-classname=org.apache.iotdb.db.service.DataNode
-
-launch_service()
-{
- class="$1"
- iotdb_parms="-Dlogback.configurationFile=${IOTDB_LOG_CONFIG}"
- iotdb_parms="$iotdb_parms -DIOTDB_HOME=${IOTDB_HOME}"
- iotdb_parms="$iotdb_parms -DIOTDB_DATA_HOME=${IOTDB_DATA_HOME}"
- iotdb_parms="$iotdb_parms -DTSFILE_HOME=${IOTDB_HOME}"
- iotdb_parms="$iotdb_parms -DIOTDB_CONF=${IOTDB_CONF}"
- iotdb_parms="$iotdb_parms -DTSFILE_CONF=${IOTDB_CONF}"
- iotdb_parms="$iotdb_parms -Dname=iotdb\.IoTDB"
- iotdb_parms="$iotdb_parms -DIOTDB_LOG_DIR=${IOTDB_LOG_DIR}"
-
- # In case the 2g memory is not enough in some scenarios, users can further
reduce the memory usage manually.
- # on heap memory size
- ON_HEAP_MEMORY="2G"
- # off heap memory size
- OFF_HEAP_MEMORY="512M"
-
- exec "$JAVA" $iotdb_parms $illegal_access_params $IOTDB_JMX_OPTS
-Xms${ON_HEAP_MEMORY} -Xmx${ON_HEAP_MEMORY}
-XX:MaxDirectMemorySize=${OFF_HEAP_MEMORY} -cp "$CLASSPATH" "$class" $PARAMS
- return $?
-}
-
-# Start up the service
-launch_service "$classname"
-
-exit $?
-
-
