[improvement][install.sh] fix the install Error "Command not found rm…

…r" & su… (apache#13163) * [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 <[email protected]>
ruanwenjun · Jan 12, 2023 · 3f16776 · 3f16776
1 parent dd0d730
commit 3f16776
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 5 deletions.
diff --git 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
@@ -63,6 +63,16 @@ DolphinScheduler 的工作计划：<a href="https://github.com/apache/dolphinsch
 ./mvnw clean install -Prelease
 ```
 
+### 构建不同版本的 Zookeeper 依赖
+
+默认支持 Zookeeper Server 3.8.0。
+```bash
+# 默认 Zookeeper Client 3.8.0
+./mvnw clean install -Prelease
+# 构建支持 Zookeeper 3.4.6+
+./mvnw clean install -Prelease -Dzk-3.4
+```
+
 制品:
 
 ```

diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md
@@ -121,7 +121,7 @@ $ docker run -d --name dolphinscheduler-alert-server \
     -d apache/dolphinscheduler-alert-server:"${DOLPHINSCHEDULER_VERSION}"
 ```
 
-> 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
@@ -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
@@ -35,8 +35,6 @@
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <quartz.version>2.3.2</quartz.version>
         <druid.version>1.2.4</druid.version>
-        <zookeeper.version>3.8.0</zookeeper.version>
-        <curator.version>5.3.0</curator.version>
         <curator-test.version>2.12.0</curator-test.version>
         <jetcd.version>0.5.11</jetcd.version>
         <jetcd.test.version>0.7.1</jetcd.test.version>
@@ -800,4 +798,28 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <profiles>
+        <profile>
+            <id>zk-3.8</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <zookeeper.version>3.8.0</zookeeper.version>
+                <curator.version>5.3.0</curator.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>zk-3.4</id>
+            <activation>
+                <property>
+                    <name>zk-3.4</name>
+                </property>
+            </activation>
+            <properties>
+                <curator.version>4.3.0</curator.version>
+                <zookeeper.version>3.4.14</zookeeper.version>
+            </properties>
+        </profile>
+    </profiles>
 </project>
diff --git 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