Apache Solr open-source search software
SOLR-15383 Solr Zookeeper status page shows green even for down Zookeepers (#103)
Jan Høydahl7c4567c8c491
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 0eb1e451daa..dc38762be8a 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -370,6 +370,8 @@ Bug Fixes* SOLR-11921: Move "cursorMark" logic from QueryComponent to SearchHandler so it can work with things like QueryElevationComponentthat modify the SortSpec in prepare(), as well as possible custom "search" components other then QueryComponent. (hossman)+* SOLR-15383: Solr Zookeeper status page shows green even when some Zookeepers are not serving requests (janhoy)+Other Changes---------------------* SOLR-15118: Deprecate CollectionAdminRequest.getV2Request(). (Jason Gerlowski)diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.javaindex 8129e56b37f..2c45f7f760f 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java@@ -313,6 +313,9 @@ public class ZookeeperStatusHandler extends RequestHandlerBase {"configuration file on each zookeeper node: '4lw.commands.whitelist=mntr,conf,ruok'. See also chapter " +"'Setting Up an External ZooKeeper Ensemble' in the Solr Reference Guide.");}+ if (response.size() == 1 && response.get(0).contains("not currently serving requests")) {+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Zookeeper " + zkHostPort + " is not currently serving requests.");+ }return true;}}diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.javaindex 24145819d1f..b14c0c45fab 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java@@ -177,6 +177,16 @@ public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {}}+ @Test(expected = SolrException.class)+ public void validateNotServingRequestsResponse() {+ try (ZookeeperStatusHandler zsh = new ZookeeperStatusHandler(null)) {+ zsh.validateZkRawResponse(Collections.singletonList("This ZooKeeper instance is not currently serving requests"),+ "zoo1:2181", "mntr");+ } catch (IOException e) {+ fail("Error closing ZookeeperStatusHandler");+ }+ }+@Testpublic void testMntrBugZk36Solr14463() {assumeWorkingMockito();