[incubator-skywalking] branch master updated: Make ZooKeeper Version Compatibility clear in document (#1916)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new a4b2cd4  Make ZooKeeper Version Compatibility clear in document (#1916)
a4b2cd4 is described below

commit a4b2cd4df2594acba97e8fbef53ea582ef6da5df
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Fri Nov 16 15:39:21 2018 +0800

    Make ZooKeeper Version Compatibility clear in document (#1916)
    
    * ZooKeeper Version Compatibility
    
    * Update backend-cluster.md
    
    Reorganize words. cc @peng-yongsheng
    
    * Update application.yml
    
    * Update application.yml
---
 docs/en/setup/backend/backend-cluster.md                     | 8 +++++++-
 oap-server/server-starter/src/main/assembly/application.yml  | 2 ++
 oap-server/server-starter/src/main/resources/application.yml | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/en/setup/backend/backend-cluster.md b/docs/en/setup/backend/backend-cluster.md
index 8d7d006..5c7d497 100644
--- a/docs/en/setup/backend/backend-cluster.md
+++ b/docs/en/setup/backend/backend-cluster.md
@@ -12,7 +12,13 @@ by using k8s native APIs to manage cluster.
 
 ## Zookeeper coordinator
 Zookeeper is a very common and wide used cluster coordinator. Set the **cluster** module's implementor
-to **zookeeper** in the yml to active.
+to **zookeeper** in the yml to active. 
+
+Required Zookeeper version, 3.5+
+
+Zookeeper version is required above 3.5 by Curator 4.0 lib, but actually Curator 4.0 is compatible with ZooKeeper 3.4.x.
+To make ZooKeeper 3.4.x works, please replace the ZooKeeper 3.5+ library jar in `oap-libs` folder with ZooKeeper 3.4.x library.
+
 ```yaml
 cluster:
   zookeeper:
diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml
index c4fc574..312f356 100644
--- a/oap-server/server-starter/src/main/assembly/application.yml
+++ b/oap-server/server-starter/src/main/assembly/application.yml
@@ -16,6 +16,8 @@
 
 cluster:
   standalone:
+  # Please check your ZooKeeper is 3.5+, However, it is also compatible with ZooKeeper 3.4.x. Replace the ZooKeeper 3.5+
+  # library in the oap-libs folder with your ZooKeeper 3.4.x libraru.
 #  zookeeper:
 #    hostPort: localhost:2181
 #    # Retry Policy
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 2236cfc..cd57703 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -16,6 +16,8 @@
 
 cluster:
   standalone:
+   # Please check your ZooKeeper is 3.5+, However, it is also compatible with ZooKeeper 3.4.x. Replace the ZooKeeper 3.5+
+   # library the oap-libs folder with your ZooKeeper 3.4.x library.
 #  zookeeper:
 #    hostPort: localhost:2181
 #    # Retry Policy