Unverified Commit afd9139c authored by chendapao's avatar chendapao Committed by GitHub
Browse files

[Feature]use zk own del func (#3310) 



* use zk own del func

* Update remove-zk-node.sh

Co-authored-by: default avatardailidong <dailidong66@gmail.com>
parent d006bd3b

dolphinscheduler-server/src/main/resources/config/install_config.conf

100644 → 100755
+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ dbname="dolphinscheduler" 
# zk cluster

zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"



# zk root directory

zkRoot="/dolphinscheduler"



# Note: the target installation path for dolphinscheduler, please not config as the same as the current path (pwd)

installPath="/data1_1T/dolphinscheduler"

install.sh

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ sed -i ${txt} "s#java.security.krb5.conf.path.*#java.security.krb5.conf.path=${k 
sed -i ${txt} "s#login.user.keytab.username.*#login.user.keytab.username=${keytabUserName}#g" conf/common.properties

sed -i ${txt} "s#login.user.keytab.path.*#login.user.keytab.path=${keytabPath}#g" conf/common.properties

sed -i ${txt} "s#zookeeper.quorum.*#zookeeper.quorum=${zkQuorum}#g" conf/zookeeper.properties

sed -i ${txt} "s\#zookeeper.dolphinscheduler.root.*#zookeeper.dolphinscheduler.root=${zkRoot}#g" conf/zookeeper.properties

sed -i ${txt} "s#server.port.*#server.port=${apiServerPort}#g" conf/application-api.properties

sed -i ${txt} "s#mail.server.host.*#mail.server.host=${mailServerHost}#g" conf/alert.properties

sed -i ${txt} "s#mail.server.port.*#mail.server.port=${mailServerPort}#g" conf/alert.properties

script/remove-zk-node.sh

100644 → 100755
+5 −3
Original line number Diff line number Diff line
@@ -31,18 +31,20 @@ BIN_DIR=`dirname $0` 
BIN_DIR=`cd "$BIN_DIR"; pwd`

DOLPHINSCHEDULER_HOME=$BIN_DIR/..



source ${BIN_DIR}/../conf/config/install_config.conf



export JAVA_HOME=$JAVA_HOME





export DOLPHINSCHEDULER_CONF_DIR=$DOLPHINSCHEDULER_HOME/conf

export DOLPHINSCHEDULER_LIB_JARS=$DOLPHINSCHEDULER_HOME/lib/*



export DOLPHINSCHEDULER_OPTS="-server -Xmx1g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"

export DOLPHINSCHEDULER_OPTS="-Xmx1g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "

export STOP_TIMEOUT=5



CLASS=org.apache.dolphinscheduler.server.utils.RemoveZKNode

CLASS=org.apache.zookeeper.ZooKeeperMain



exec_command="$DOLPHINSCHEDULER_OPTS -classpath $DOLPHINSCHEDULER_CONF_DIR:$DOLPHINSCHEDULER_LIB_JARS $CLASS $rootNode"

exec_command="$DOLPHINSCHEDULER_OPTS -classpath $DOLPHINSCHEDULER_CONF_DIR:$DOLPHINSCHEDULER_LIB_JARS $CLASS -server $zkQuorum rmr $rootNode"



cd $DOLPHINSCHEDULER_HOME

$JAVA_HOME/bin/java $exec_command