This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch chore/zk-incompatible-version in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 446c57e27e82b7d178d7e3ef480acbfb104b3d67 Author: kezhenxu94 <[email protected]> AuthorDate: Wed Jun 30 17:47:07 2021 +0800 Doc: update doc to declare that zookeeper 3.5+ is required in cluster coordinator We previously updated the zookeeper client version to 3.5.x in #7090, which is incompatible with 3.4 server, we need to update the doc accordingly. --- CHANGES.md | 2 +- docs/en/setup/backend/backend-cluster.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8ae7936..e4ce561 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -42,7 +42,7 @@ Release Notes. * Upgrade netty caused by CVE-2019-20444, CVE-2019-20445, CVE-2019-16869, CVE-2020-11612, CVE-2021-21290, CVE-2021-21295 and CVE-2021-21409. * Upgrade consul client caused by CVE-2018-1000844, CVE-2018-1000850. -* Upgrade zookeeper caused by CVE-2019-0201. +* Upgrade zookeeper caused by CVE-2019-0201, zookeeper cluster coordinator plugin now requires zookeeper server 3.5+. * Upgrade snake yaml caused by CVE-2017-18640. * Upgrade embed tomcat caused by CVE-2020-13935. * Upgrade commons-lang3 to avoid potential NPE in some JDK versions. diff --git a/docs/en/setup/backend/backend-cluster.md b/docs/en/setup/backend/backend-cluster.md index 06b250a..80247f0 100644 --- a/docs/en/setup/backend/backend-cluster.md +++ b/docs/en/setup/backend/backend-cluster.md @@ -22,7 +22,7 @@ You can specify any of them in the `selector` property to enable it. ## Zookeeper coordinator Zookeeper is a very common and widely used cluster coordinator. Set the **cluster/selector** to **zookeeper** in the yml to enable it. -Required Zookeeper version: 3.4+ +Required Zookeeper version: 3.5+ ```yaml cluster: @@ -31,9 +31,9 @@ cluster: ``` - `hostPort` is the list of zookeeper servers. Format is `IP1:PORT1,IP2:PORT2,...,IPn:PORTn` -- `enableACL` enable [Zookeeper ACL](https://zookeeper.apache.org/doc/r3.4.1/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) to control access to its znode. +- `enableACL` enable [Zookeeper ACL](https://zookeeper.apache.org/doc/r3.5.5/zookeeperProgrammers.html#sc_ZooKeeperAccessControl) to control access to its znode. - `schema` is Zookeeper ACL schemas. -- `expression` is a expression of ACL. The format of the expression is specific to the [schema](https://zookeeper.apache.org/doc/r3.4.1/zookeeperProgrammers.html#sc_BuiltinACLSchemes). +- `expression` is a expression of ACL. The format of the expression is specific to the [schema](https://zookeeper.apache.org/doc/r3.5.5/zookeeperProgrammers.html#sc_BuiltinACLSchemes). - `hostPort`, `baseSleepTimeMs` and `maxRetries` are settings of Zookeeper curator client. Note:
