You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2014/12/24 22:55:05 UTC
svn commit: r1647849 - in /lucene/dev/trunk/solr/core/src:
java/org/apache/solr/cloud/OverseerCollectionProcessor.java
java/org/apache/solr/handler/admin/CollectionsHandler.java
test/org/apache/solr/cloud/TestReplicaProperties.java
Author: erick
Date: Wed Dec 24 21:55:05 2014
New Revision: 1647849
URL: http://svn.apache.org/r1647849
Log:
SOLR-6860: Re-enable REBALANCELEADERS for 5.1. going to let this bake in trunk only until 5.0 is cut
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java
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=1647849&r1=1647848&r2=1647849&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 Wed Dec 24 21:55:05 2014
@@ -658,9 +658,9 @@ public class OverseerCollectionProcessor
case BALANCESHARDUNIQUE:
balanceProperty(message);
break;
-// case REBALANCELEADERS:
-// processAssignLeaders(message);
-// break;
+ case REBALANCELEADERS:
+ processAssignLeaders(message);
+ break;
default:
throw new SolrException(ErrorCode.BAD_REQUEST, "Unknown operation:"
+ operation);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1647849&r1=1647848&r2=1647849&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Wed Dec 24 21:55:05 2014
@@ -268,10 +268,10 @@ public class CollectionsHandler extends
this.handleBalanceShardUnique(req, rsp);
break;
}
-// case REBALANCELEADERS: {
-// this.handleBalanceLeaders(req, rsp);
-// break;
-// }
+ case REBALANCELEADERS: {
+ this.handleBalanceLeaders(req, rsp);
+ break;
+ }
default: {
throw new RuntimeException("Unknown action: " + action);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java?rev=1647849&r1=1647848&r2=1647849&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java Wed Dec 24 21:55:05 2014
@@ -193,17 +193,11 @@ public class TestReplicaProperties exten
// leaders _also_ have the preferredLeader property set.
- try {
- NamedList<Object> res = doPropertyAction(client,
- "action", CollectionParams.CollectionAction.REBALANCELEADERS.toString(),
- "collection", COLLECTION_NAME);
- fail("Should have thrown 'Unknown action' error");
- } catch (SolrServerException e) {
- assertTrue("Should have gotten an error message that REBALANCELEADERS is not supported",
- e.getCause().getMessage().contains("Unknown action: REBALANCELEADERS"));
- }
+ NamedList<Object> res = doPropertyAction(client,
+ "action", CollectionParams.CollectionAction.REBALANCELEADERS.toString(),
+ "collection", COLLECTION_NAME);
-// verifyLeaderAssignment(client, COLLECTION_NAME);
+ verifyLeaderAssignment(client, COLLECTION_NAME);
} finally {
client.shutdown();