SOLR-13954: Embedded ZooKeeper in Solr now does not try to load JettyAdminServer (#1059)

(cherry picked from commit 7417fa1cf3)
2019-12-06 11:03:23 +01:00 · 2019-12-06 11:03:23 +01:00 · 912789bb93
parent 0cd302d7b7
commit 912789bb93
3 changed files with 7 additions and 0 deletions
--- 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
 ---------------------

--- 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
--- 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