You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/06/27 14:16:40 UTC
svn commit: r1606047 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java
Author: shalin
Date: Fri Jun 27 12:16:39 2014
New Revision: 1606047
URL: http://svn.apache.org/r1606047
Log:
SOLR-6044: The 'clusterstatus' API should return live_nodes as well
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1606047&r1=1606046&r2=1606047&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Jun 27 12:16:39 2014
@@ -32,6 +32,8 @@ New Features
* SOLR-6069: The 'clusterstatus' API should return 'roles' information. (shalin)
+* SOLR-6044: The 'clusterstatus' API should return live_nodes as well. (shalin)
+
Bug Fixes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1606047&r1=1606046&r2=1606047&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Fri Jun 27 12:16:39 2014
@@ -697,7 +697,7 @@ public class OverseerCollectionProcessor
}
Map roles = null;
- if(zkStateReader.getZkClient().exists(ZkStateReader.ROLES, true)){
+ if (zkStateReader.getZkClient().exists(ZkStateReader.ROLES, true)) {
roles = (Map) ZkStateReader.fromJSON(zkStateReader.getZkClient().getData(ZkStateReader.ROLES, null, null, true));
}
@@ -763,6 +763,10 @@ public class OverseerCollectionProcessor
clusterStatus.add("roles", roles);
}
+ // add live_nodes
+ List<String> liveNodes = zkStateReader.getZkClient().getChildren(ZkStateReader.LIVE_NODES_ZKNODE, null, true);
+ clusterStatus.add("live_nodes", liveNodes);
+
results.add("cluster", clusterStatus);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java?rev=1606047&r1=1606046&r2=1606047&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java Fri Jun 27 12:16:39 2014
@@ -141,6 +141,9 @@ public class TestCollectionAPI extends A
assertNotNull(collections.get(COLLECTION_NAME1));
assertEquals(4, collections.size());
+ List<String> liveNodes = (List<String>) cluster.get("live_nodes");
+ assertNotNull("Live nodes should not be null", liveNodes);
+ assertFalse(liveNodes.isEmpty());
} finally {
//remove collections
client.shutdown();