This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new afd9139 [Feature]use zk own del func (#3310)
afd9139 is described below
commit afd9139c3fdc00daf21f2069fc2b5af361e43498
Author: chendapao <[email protected]>
AuthorDate: Thu Jul 30 18:26:27 2020 +0800
[Feature]use zk own del func (#3310)
* use zk own del func
* Update remove-zk-node.sh
Co-authored-by: dailidong <[email protected]>
---
.../src/main/resources/config/install_config.conf | 3 +++
install.sh | 1 +
script/remove-zk-node.sh | 8 +++++---
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git
a/dolphinscheduler-server/src/main/resources/config/install_config.conf
b/dolphinscheduler-server/src/main/resources/config/install_config.conf
old mode 100644
new mode 100755
index 6da5fbe..d88f1cf
--- a/dolphinscheduler-server/src/main/resources/config/install_config.conf
+++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf
@@ -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"
diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
index a74fe67..b904f68
--- a/install.sh
+++ b/install.sh
@@ -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
diff --git a/script/remove-zk-node.sh b/script/remove-zk-node.sh
old mode 100644
new mode 100755
index 1fff1d5..1129ca6
--- a/script/remove-zk-node.sh
+++ b/script/remove-zk-node.sh
@@ -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
