svn commit: r1633621 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

[th...@apache.org]

Author: thelabdude
Date: Wed Oct 22 14:07:38 2014
New Revision: 1633621

URL: http://svn.apache.org/r1633621
Log:
SOLR-6641: SystemInfoHandler should include the zkHost the node is using (when running in solrcloud mode)

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1633621&r1=1633620&r2=1633621&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Oct 22 14:07:38 2014
@@ -343,6 +343,9 @@ Other Changes
 * SOLR-6592: Avoid waiting for the leader to see the down state if that leader is not live.
   (Timothy Potter)
 
+* SOLR-6641: SystemInfoHandler should include the zkHost the node is using (when running in solrcloud mode)
+  (Timothy Potter)
+
 ==================  4.10.1 ==================
 
 Bug Fixes

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1633621&r1=1633620&r2=1633621&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Wed Oct 22 14:07:38 2014
@@ -92,6 +92,9 @@ public class SystemInfoHandler extends R
     if (core != null) rsp.add( "core", getCoreInfo( core, req.getSchema() ) );
     boolean solrCloudMode =  getCoreContainer(req, core).isZooKeeperAware();
     rsp.add( "mode", solrCloudMode ? "solrcloud" : "std");
+    if (solrCloudMode) {
+      rsp.add("zkHost", getCoreContainer(req, core).getZkController().getZkServerAddress());
+    }
     rsp.add( "lucene", getLuceneInfo() );
     rsp.add( "jvm", getJvmInfo() );
     rsp.add( "system", getSystemInfo() );