From 880f32b98a92056c8500c878ba97c4d01fcbc4a5 Mon Sep 17 00:00:00 2001 From: Manikumar Reddy Date: Wed, 11 Dec 2019 20:04:45 +0530 Subject: [PATCH 1/4] MINOR: Update ZooKeeper upgrade notes --- config/zookeeper.properties | 5 ----- docs/upgrade.html | 13 ++++++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/config/zookeeper.properties b/config/zookeeper.properties index 8c186a3cf9fed..90f4332ec31cf 100644 --- a/config/zookeeper.properties +++ b/config/zookeeper.properties @@ -22,8 +22,3 @@ maxClientCnxns=0 # Set the port to something non-conflicting if choosing to enable this admin.enableServer=false # admin.serverPort=8080 - -# Enable snapshot.trust.empty config if the ZK upgrade from 3.4.X to 3.5.6 is failing -# with "java.io.IOException: No snapshot found, but there are log entries" error. -# Check upgrade docs for more details. -# snapshot.trust.empty=true diff --git a/docs/upgrade.html b/docs/upgrade.html index 2f470e3805180..ec836c0150be4 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -72,9 +72,16 @@

Upgrading from 0.8.x, 0.9.x, 0.1

Additional Upgrade Notes:

    -
  1. ZooKeeper has been upgraded to 3.5.6. Set snapshot.trust.empty=true in zookeeper.properties before the upgrade - to avoid ZOOKEEPER-3056. After the new version starts successfully, it is safe to remove this config. - See ZooKeeper advanced configuration for more details. +
  2. ZooKeeper has been upgraded to 3.5.6. ZooKeeper upgrade from 3.4.X to 3.5.6 can fail if there are no snapshot files in 3.4 data directory. + This usually happens in testing upgrades. The workaround for the issue is given ZooKeeper Upgrade FAQ. + For more details about the issue please refer to ZOOKEEPER-3056 + and ZOOKEEPER-3644. +
    3. +
  3. + An embedded Jetty based AdminServer added in ZooKeeper 3.5. + AdminServer is enabled by default in ZooKeeper and is started on port 8080. + AdminServer is disabled by default in the ZooKeeper config (zookeeper.properties) provided by the Apache Kafka distribution. + Please refer AdminServer config to configure the AdminServer.
From d72d2dfe47cab7fe908d53a7c3227c280f44dee3 Mon Sep 17 00:00:00 2001 From: Manikumar Reddy Date: Wed, 11 Dec 2019 21:00:43 +0530 Subject: [PATCH 2/4] Address review comments --- docs/upgrade.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/upgrade.html b/docs/upgrade.html index ec836c0150be4..95d7d2cd155fe 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -73,7 +73,8 @@

Upgrading from 0.8.x, 0.9.x, 0.1
  1. ZooKeeper has been upgraded to 3.5.6. ZooKeeper upgrade from 3.4.X to 3.5.6 can fail if there are no snapshot files in 3.4 data directory. - This usually happens in testing upgrades. The workaround for the issue is given ZooKeeper Upgrade FAQ. + This usually happens in test upgrades where ZooKeeper 3.5.6 is trying to load an existing 3.4 data dir in which no snapshot file has been created. + The workaround for the issue is given in ZooKeeper Upgrade FAQ. For more details about the issue please refer to ZOOKEEPER-3056 and ZOOKEEPER-3644.
    2. @@ -81,6 +82,7 @@

    Upgrading from 0.8.x, 0.9.x, 0.1 An embedded Jetty based AdminServer added in ZooKeeper 3.5. AdminServer is enabled by default in ZooKeeper and is started on port 8080. AdminServer is disabled by default in the ZooKeeper config (zookeeper.properties) provided by the Apache Kafka distribution. + Make sure to update your local zookeeper.properties file with admin.enableServer=false if you wish to disable the AdminServer. Please refer AdminServer config to configure the AdminServer.

From 8d6c74a7882ba9c9e581c83d4ccfdd8ddb947588 Mon Sep 17 00:00:00 2001 From: Manikumar Reddy Date: Thu, 12 Dec 2019 21:38:32 +0530 Subject: [PATCH 3/4] Address review comments --- docs/upgrade.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/upgrade.html b/docs/upgrade.html index 95d7d2cd155fe..2524b04b9951b 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -74,9 +74,14 @@

Upgrading from 0.8.x, 0.9.x, 0.1
  1. ZooKeeper has been upgraded to 3.5.6. ZooKeeper upgrade from 3.4.X to 3.5.6 can fail if there are no snapshot files in 3.4 data directory. This usually happens in test upgrades where ZooKeeper 3.5.6 is trying to load an existing 3.4 data dir in which no snapshot file has been created. - The workaround for the issue is given in ZooKeeper Upgrade FAQ. - For more details about the issue please refer to ZOOKEEPER-3056 - and ZOOKEEPER-3644. + For more details about the issue please refer to ZOOKEEPER-3056. + For multi-node ZooKeeper cluster upgrades, set snapshot.trust.empty=true in zookeeper.properties before the upgrade + to avoid ZOOKEEPER-3056. After the new version starts successfully, it is safe to remove this config. + See ZooKeeper advanced configuration for more details. + For standalone cluster upgrades, we have observed a data loss issue when using snapshot.trust.empty=true config. + For more details about the issue please refer to ZOOKEEPER-3644. + The workaround is need to manually copy the snapshot file to the 3.4 data directory. + For more details about the workaround please refer to ZooKeeper Upgrade FAQ.
  2. An embedded Jetty based AdminServer added in ZooKeeper 3.5. @@ -91,7 +96,7 @@
    Notable changes in 2