commit 016993b65e393b58246d54e8ddda9f56a453eb0e
author Jan Høydahl <janhoy@users.noreply.github.com> Fri Aug 14 01:32:28 2020 +0200
committer Tomas Fernandez Lobbe <tflobbe@apache.org> Tue Aug 25 13:57:00 2020 -0700
tree 351cbc298e81fcc1289d73d0b5ef4782283626d7
parent 5ab8c34fc4cf07e5c02b4b426c35f7185c3529b0

SOLR-14751: Zookeeper Admin screen not working for old ZK versions

solr/CHANGES.txt

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4974dea..249c058 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -10,7 +10,7 @@
 
 Bug Fixes
 ---------------------
-(No changes)
+* SOLR-14751: Zookeeper Admin screen not working for old ZK versions (janhoy)
 
 ==================  8.6.1 ==================
 

solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java

diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
index 897ae26..9b1101e 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
@@ -773,6 +773,9 @@
         return "";
       }
       return new String(data, StandardCharsets.UTF_8);
+    } catch (NoNodeException nne) {
+      log.debug("Zookeeper does not have the /zookeeper/config znode, assuming old ZK version");
+      return "";
     } catch (KeeperException|InterruptedException ex) {
       throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Failed to get config from zookeeper", ex);
     }