From 3f16776cd770bb12681389b77cd226a963c58b97 Mon Sep 17 00:00:00 2001 From: v-wx-v <39860372+v-wx-v@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:07:58 +0800 Subject: [PATCH] =?UTF-8?q?[improvement][install.sh]=20fix=20the=20install?= =?UTF-8?q?=20Error=20"Command=20not=20found=20rmr"=20=20&=20su=E2=80=A6?= =?UTF-8?q?=20(#13163)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [BUG][install.sh] fix the install Error "Command not found rmr" & support ZooKeeper (3.4.6+) * [BUG][install.sh] fix the install Error "Command not found rmr" & support ZooKeeper (3.4.6+) * [BUG][install.sh] fix the install Error "Command not found rmr" & support ZooKeeper (3.4.6+) * [docs] add documentation for building with different ZK versions * support both 3.4 and 3.8 * [docs] add documentation for building with different ZK versions * support both 3.4 and 3.8 * [improvement][install.sh] fix the install Error "Command not found rmr" & support ZooKeeper (3.4.6+) * update known-dependencies.txt * [improvement][install.sh] fix the install Error "Command not found rmr" * support ZooKeeper (3.4.6+) by activating zk-3.4 profile * make zk-3.8 as default option in pom.xml * update defalut ZK version in docs * update known-dependencies.txt Co-authored-by: wangxx --- README.md | 10 ++++++++++ README_zh_CN.md | 10 ++++++++++ docs/docs/en/guide/start/docker.md | 2 +- docs/docs/zh/guide/start/docker.md | 2 +- dolphinscheduler-bom/pom.xml | 26 ++++++++++++++++++++++++-- script/remove-zk-node.sh | 2 +- 6 files changed, 47 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e57cc20f58..d01bece5c5 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,16 @@ Please refer to the official website document: [QuickStart in Kubernetes](https: ./mvnw clean install -Prelease ``` +### Build with different Zookeeper versions + +The default Zookeeper Server version supported is 3.8.0. +```bash +# Default Zookeeper 3.8.0 +./mvnw clean install -Prelease +# Support to Zookeeper 3.4.6+ +./mvnw clean install -Prelease -Dzk-3.4 +``` + Artifact: ``` diff --git a/README_zh_CN.md b/README_zh_CN.md index 84a28151f1..4153ef5b05 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -63,6 +63,16 @@ DolphinScheduler 的工作计划： Note: You should install and start [PostgreSQL](https://www.postgresql.org/download/)(8.2.15+) and [ZooKeeper](https://zookeeper.apache.org/releases.html)(3.4.6+) +> Note: You should install and start [PostgreSQL](https://www.postgresql.org/download/)(8.2.15+) and [ZooKeeper](https://zookeeper.apache.org/releases.html)(3.8.0) > by yourself if you want to use this way to start Dolphinscheduler, but you do not have those services ## Login DolphinScheduler diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md index 2f6107e28f..8b4671cd1a 100644 --- a/docs/docs/zh/guide/start/docker.md +++ b/docs/docs/zh/guide/start/docker.md @@ -115,7 +115,7 @@ $ docker run -d --name dolphinscheduler-alert-server \ ``` > 注意：如果你本地还没有对应的数据库和 ZooKeeper 服务，但是想要尝试这个启动方式，可以先安装并启动 -> [PostgreSQL](https://www.postgresql.org/download/)(8.2.15+) 以及 [ZooKeeper](https://zookeeper.apache.org/releases.html)(3.4.6+) +> [PostgreSQL](https://www.postgresql.org/download/)(8.2.15+) 以及 [ZooKeeper](https://zookeeper.apache.org/releases.html)(3.8.0) ## 登录系统 diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index 4743ef0f28..6d2c156b16 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -35,8 +35,6 @@ 3.5.2 2.3.2 1.2.4 - 3.8.0 - 5.3.0 2.12.0 0.5.11 0.7.1 @@ -800,4 +798,28 @@ + + + zk-3.8 + + true + + + 3.8.0 + 5.3.0 + + + + zk-3.4 + + + zk-3.4 + + + + 4.3.0 + 3.4.14 + + + diff --git a/script/remove-zk-node.sh b/script/remove-zk-node.sh index fbedd31580..ec45b1cc23 100755 --- a/script/remove-zk-node.sh +++ b/script/remove-zk-node.sh @@ -44,7 +44,7 @@ export STOP_TIMEOUT=5 CLASS=org.apache.zookeeper.ZooKeeperMain -exec_command="$DOLPHINSCHEDULER_OPTS -classpath $DOLPHINSCHEDULER_CONF_DIR:$DOLPHINSCHEDULER_LIB_JARS $CLASS -server $REGISTRY_ZOOKEEPER_CONNECT_STRING rmr $rootNode" +exec_command="$DOLPHINSCHEDULER_OPTS -classpath $DOLPHINSCHEDULER_CONF_DIR:$DOLPHINSCHEDULER_LIB_JARS $CLASS -server $REGISTRY_ZOOKEEPER_CONNECT_STRING deleteall $rootNode" cd $DOLPHINSCHEDULER_HOME $JAVA_HOME/bin/java $exec_command