This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/fix_shell_problem_IOTDB_4056 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e97eede241832b90f324fcd23fbbfbd099733f1c Author: Beyyes <[email protected]> AuthorDate: Mon Aug 8 18:42:02 2022 +0800 fix shell remove-confignode.sh problem, IOTDB-4056 --- .../assembly/resources/sbin/remove-confignode.sh | 42 ++++++++++++---------- .../assembly/resources/sbin/start-confignode.sh | 36 +++++++++---------- .../src/assembly/resources/sbin/stop-confignode.sh | 11 +++--- 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/confignode/src/assembly/resources/sbin/remove-confignode.sh b/confignode/src/assembly/resources/sbin/remove-confignode.sh index eace0d2912..0075625efe 100644 --- a/confignode/src/assembly/resources/sbin/remove-confignode.sh +++ b/confignode/src/assembly/resources/sbin/remove-confignode.sh @@ -18,20 +18,19 @@ # under the License. # - echo ---------------------------- echo Starting to remove IoTDB ConfigNode echo ---------------------------- if [ -z "${CONFIGNODE_HOME}" ]; then - export CONFIGNODE_HOME="`dirname "$0"`/.." + export CONFIGNODE_HOME="$(dirname "$0")/.." fi CONFIGNODE_CONF=${CONFIGNODE_HOME}/conf CONFIGNODE_LOGS=${CONFIGNODE_HOME}/logs is_conf_path=false -for arg do +for arg; do shift if [ "$arg" == "-c" ]; then is_conf_path=true @@ -48,29 +47,34 @@ done CONF_PARAMS="-r "$* if [ -f "$CONFIGNODE_CONF/confignode-env.sh" ]; then - if [ "$#" -ge "1" -a "$1" == "printgc" ]; then - . "$CONFIGNODE_CONF/confignode-env.sh" "printgc" - else - . "$CONFIGNODE_CONF/confignode-env.sh" - fi + if [ "$#" -ge "1" -a "$1" == "printgc" ]; then + . "$CONFIGNODE_CONF/confignode-env.sh" "printgc" + else + . "$CONFIGNODE_CONF/confignode-env.sh" + fi +else + echo "can't find $CONFIGNODE_CONF/confignode-env.sh" +fi + +if [ -d ${CONFIGNODE_HOME}/lib ]; then + LIB_PATH=${CONFIGNODE_HOME}/lib else - echo "can't find $CONFIGNODE_CONF/confignode-env.sh" + LIB_PATH=${CONFIGNODE_HOME}/../lib fi -CLASSPATH="" -for f in ${CONFIGNODE_HOME}/lib/*.jar; do +for f in ${LIB_PATH}/*.jar; do CLASSPATH=${CLASSPATH}":"$f done classname=org.apache.iotdb.confignode.service.ConfigNode -launch_service() -{ - class="$1" - confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback.xml" - confignode_parms="$confignode_parms -DCONFIGNODE_HOME=${CONFIGNODE_HOME}" - confignode_parms="$confignode_parms -DCONFIGNODE_CONF=${CONFIGNODE_CONF}" - exec "$JAVA" $illegal_access_params $confignode_parms $CONFIGNODE_JMX_OPTS -cp "$CLASSPATH" "$class" $CONF_PARAMS - return $? +launch_service() { + class="$1" + confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback.xml" + confignode_parms="$confignode_parms -DCONFIGNODE_HOME=${CONFIGNODE_HOME}" + confignode_parms="$confignode_parms -DCONFIGNODE_CONF=${CONFIGNODE_CONF}" + echo "$JAVA" $illegal_access_params $confignode_parms $CONFIGNODE_JMX_OPTS -cp "$CLASSPATH" "$class" $CONF_PARAMS + exec "$JAVA" $illegal_access_params $confignode_parms $CONFIGNODE_JMX_OPTS -cp "$CLASSPATH" "$class" $CONF_PARAMS + return $? } # Start up the service diff --git a/confignode/src/assembly/resources/sbin/start-confignode.sh b/confignode/src/assembly/resources/sbin/start-confignode.sh index 8a04fb47f5..eec139dab4 100644 --- a/confignode/src/assembly/resources/sbin/start-confignode.sh +++ b/confignode/src/assembly/resources/sbin/start-confignode.sh @@ -18,20 +18,19 @@ # under the License. # - echo ---------------------------- echo Starting IoTDB ConfigNode echo ---------------------------- if [ -z "${CONFIGNODE_HOME}" ]; then - export CONFIGNODE_HOME="`dirname "$0"`/.." + export CONFIGNODE_HOME="$(dirname "$0")/.." fi CONFIGNODE_CONF=${CONFIGNODE_HOME}/conf CONFIGNODE_LOGS=${CONFIGNODE_HOME}/logs is_conf_path=false -for arg do +for arg; do shift if [ "$arg" == "-c" ]; then is_conf_path=true @@ -48,19 +47,19 @@ done CONF_PARAMS="-s "$* if [ -f "$CONFIGNODE_CONF/confignode-env.sh" ]; then - if [ "$#" -ge "1" -a "$1" == "printgc" ]; then - . "$CONFIGNODE_CONF/confignode-env.sh" "printgc" - else - . "$CONFIGNODE_CONF/confignode-env.sh" - fi + if [ "$#" -ge "1" -a "$1" == "printgc" ]; then + . "$CONFIGNODE_CONF/confignode-env.sh" "printgc" + else + . "$CONFIGNODE_CONF/confignode-env.sh" + fi else - echo "can't find $CONFIGNODE_CONF/confignode-env.sh" + echo "can't find $CONFIGNODE_CONF/confignode-env.sh" fi if [ -d ${CONFIGNODE_HOME}/lib ]; then -LIB_PATH=${CONFIGNODE_HOME}/lib + LIB_PATH=${CONFIGNODE_HOME}/lib else -LIB_PATH=${CONFIGNODE_HOME}/../lib + LIB_PATH=${CONFIGNODE_HOME}/../lib fi CLASSPATH="" @@ -69,14 +68,13 @@ for f in ${LIB_PATH}/*.jar; do done classname=org.apache.iotdb.confignode.service.ConfigNode -launch_service() -{ - class="$1" - confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback.xml" - confignode_parms="$confignode_parms -DCONFIGNODE_HOME=${CONFIGNODE_HOME}" - confignode_parms="$confignode_parms -DCONFIGNODE_CONF=${CONFIGNODE_CONF}" - exec "$JAVA" $illegal_access_params $confignode_parms $CONFIGNODE_JMX_OPTS -cp "$CLASSPATH" "$class" $CONF_PARAMS - return $? +launch_service() { + class="$1" + confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback.xml" + confignode_parms="$confignode_parms -DCONFIGNODE_HOME=${CONFIGNODE_HOME}" + confignode_parms="$confignode_parms -DCONFIGNODE_CONF=${CONFIGNODE_CONF}" + exec "$JAVA" $illegal_access_params $confignode_parms $CONFIGNODE_JMX_OPTS -cp "$CLASSPATH" "$class" $CONF_PARAMS + return $? } # Start up the service diff --git a/confignode/src/assembly/resources/sbin/stop-confignode.sh b/confignode/src/assembly/resources/sbin/stop-confignode.sh index e3317c9605..9961ffd623 100644 --- a/confignode/src/assembly/resources/sbin/stop-confignode.sh +++ b/confignode/src/assembly/resources/sbin/stop-confignode.sh @@ -18,14 +18,13 @@ # under the License. # +CONFIGNODE_CONF="$(dirname "$0")/../conf" +internal_port=$(sed '/^internal_port=/!d;s/.*=//' ${CONFIGNODE_CONF}/iotdb-confignode.properties) -CONFIGNODE_CONF="`dirname "$0"`/../conf" -internal_port=`sed '/^internal_port=/!d;s/.*=//' ${CONFIGNODE_CONF}/iotdb-confignode.properties` - -if type lsof > /dev/null 2>&1 ; then +if type lsof >/dev/null 2>&1; then PID=$(lsof -t -i:${internal_port} -sTCP:LISTEN) -elif type netstat > /dev/null 2>&1 ; then - PID=$(netstat -anp 2>/dev/null | grep ":${internal_port} " | grep ' LISTEN ' | awk '{print $NF}' | sed "s|/.*||g" ) +elif type netstat >/dev/null 2>&1; then + PID=$(netstat -anp 2>/dev/null | grep ":${internal_port} " | grep ' LISTEN ' | awk '{print $NF}' | sed "s|/.*||g") else echo "" echo " Error: No necessary tool."
