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 2015/04/14 07:25:12 UTC
svn commit: r1673360 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
core/src/test/org/apache/solr/cloud/TestCollectionAPI.java
Author: shalin
Date: Tue Apr 14 05:25:12 2015
New Revision: 1673360
URL: http://svn.apache.org/r1673360
Log:
SOLR-7385: The clusterstatus API now returns the config set used to create a collection inside a 'configName' key
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1673360&r1=1673359&r2=1673360&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Apr 14 05:25:12 2015
@@ -108,6 +108,9 @@ Bug Fixes
* SOLR-7380: SearchHandler should not try to load runtime components in inform() (Noble Paul)
+* SOLR-7385: The clusterstatus API now returns the config set used to create a collection
+ inside a 'configName' key. (Shai Erera, shalin)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1673360&r1=1673359&r2=1673360&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Tue Apr 14 05:25:12 2015
@@ -823,6 +823,8 @@ public class OverseerCollectionProcessor
if (collectionVsAliases.containsKey(name) && !collectionVsAliases.get(name).isEmpty()) {
collectionStatus.put("aliases", collectionVsAliases.get(name));
}
+ String configName = zkStateReader.readConfigName(name);
+ collectionStatus.put("configName", configName);
collectionProps.add(name, collectionStatus);
}
} else {
@@ -839,6 +841,8 @@ public class OverseerCollectionProcessor
if (collectionVsAliases.containsKey(collection) && !collectionVsAliases.get(collection).isEmpty()) {
collectionStatus.put("aliases", collectionVsAliases.get(collection));
}
+ String configName = zkStateReader.readConfigName(collection);
+ collectionStatus.put("configName", configName);
collectionProps.add(collection, collectionStatus);
} else {
DocCollection coll = clusterState.getCollection(collection);
@@ -855,6 +859,8 @@ public class OverseerCollectionProcessor
if (collectionVsAliases.containsKey(collection) && !collectionVsAliases.get(collection).isEmpty()) {
collectionStatus.put("aliases", collectionVsAliases.get(collection));
}
+ String configName = zkStateReader.readConfigName(collection);
+ collectionStatus.put("configName", configName);
collectionProps.add(collection, collectionStatus);
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java?rev=1673360&r1=1673359&r2=1673360&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java Tue Apr 14 05:25:12 2015
@@ -162,8 +162,10 @@ public class TestCollectionAPI extends R
assertNotNull("Cluster state should not be null", cluster);
NamedList<Object> collections = (NamedList<Object>) cluster.get("collections");
assertNotNull("Collections should not be null in cluster state", collections);
- assertNotNull(collections.get(COLLECTION_NAME));
assertEquals(1, collections.size());
+ Map<String, Object> collection = (Map<String, Object>) collections.get(COLLECTION_NAME);
+ assertNotNull(collection);
+ assertEquals("conf1", collection.get("configName"));
}
}
@@ -189,6 +191,7 @@ public class TestCollectionAPI extends R
assertNotNull(collections.get(DEFAULT_COLLECTION));
assertEquals(1, collections.size());
Map<String, Object> collection = (Map<String, Object>) collections.get(DEFAULT_COLLECTION);
+ assertEquals("conf1", collection.get("configName"));
Map<String, Object> shardStatus = (Map<String, Object>) collection.get("shards");
assertEquals(1, shardStatus.size());
Map<String, Object> selectedShardStatus = (Map<String, Object>) shardStatus.get(SHARD2);
@@ -225,6 +228,7 @@ public class TestCollectionAPI extends R
assertNotNull("Collections should not be null in cluster state", collections);
assertNotNull(collections.get(DEFAULT_COLLECTION));
Map<String, Object> collection = (Map<String, Object>) collections.get(DEFAULT_COLLECTION);
+ assertEquals("conf1", collection.get("configName"));
List<String> collAlias = (List<String>) collection.get("aliases");
assertEquals("Aliases not found", Lists.newArrayList("myalias"), collAlias);
}