From 912789bb933b18742c72c48b6018985fd53f69ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Fri, 6 Dec 2019 11:03:23 +0100 Subject: [PATCH] SOLR-13954: Embedded ZooKeeper in Solr now does not try to load JettyAdminServer (#1059) (cherry picked from commit 7417fa1cf3a7875b76419793a38080059f52b1fc) --- solr/CHANGES.txt | 2 ++ solr/server/solr/zoo.cfg | 3 +++ solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg | 2 ++ 3 files changed, 7 insertions(+) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 63b2e27787d..395e1dbb8ff 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -134,6 +134,8 @@ Bug Fixes * SOLR-13805: NPE when calling /solr/admin/info/health on standalone solr (Nicholas DiPiazza, shalin) +* SOLR-13954: Embedded ZooKeeper in Solr now does not try to load JettyAdminServer (janhoy) + Other Changes --------------------- diff --git a/solr/server/solr/zoo.cfg b/solr/server/solr/zoo.cfg index 7e42d8c8465..7c32425e718 100644 --- a/solr/server/solr/zoo.cfg +++ b/solr/server/solr/zoo.cfg @@ -29,3 +29,6 @@ syncLimit=5 # Purge task interval in hours # Set to "0" to disable auto purge feature #autopurge.purgeInterval=1 + +# Disable ZK AdminServer since we do not use it +admin.enableServer=false \ No newline at end of file diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg index aea451885e4..cbd6970e3fc 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg +++ b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg @@ -15,3 +15,5 @@ syncLimit=5 # clientPort=2181 # NOTE: Solr sets this based on zkRun / zkHost params +# Disable ZK AdminServer since we do not use it +admin.enableServer=false \ No newline at end of file