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/20 01:17:48 UTC
svn commit: r1646904 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/cloud/
core/src/java/org/apache/solr/handler/admin/
core/src/test/org/apache/solr/cloud/
Author: erick
Date: Sat Dec 20 00:17:48 2014
New Revision: 1646904
URL: http://svn.apache.org/r1646904
Log:
SOLR-6859: Disable REBALANCELEADERS for 5.0
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/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1646904&r1=1646903&r2=1646904&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Dec 20 00:17:48 2014
@@ -209,9 +209,6 @@ New Features
* SOLR-4715: Add CloudSolrServer constructors which accept a HttpClient instance.
(Hardik Upadhyay, Shawn Heisey, shalin)
-* SOLR-6517: CollectionsAPI call REBALANCELEADERS. Used to balance leaders
- across nodes for a particular collection
-
* SOLR-5992: add "removeregex" as an atomic update operation
(Vitaliy Zhovtyuk via Erick Erickson)
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=1646904&r1=1646903&r2=1646904&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 Sat Dec 20 00:17:48 2014
@@ -655,9 +655,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=1646904&r1=1646903&r2=1646904&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 Sat Dec 20 00:17:48 2014
@@ -267,10 +267,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/ReplicaPropertiesBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java?rev=1646904&r1=1646903&r2=1646904&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java Sat Dec 20 00:17:48 2014
@@ -32,6 +32,7 @@ import org.apache.solr.common.cloud.DocC
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.NamedList;
import org.apache.zookeeper.KeeperException;
// Collect useful operations for testing assigning properties to individual replicas
@@ -39,7 +40,7 @@ import org.apache.zookeeper.KeeperExcept
// and shards, but for now this will do.
public abstract class ReplicaPropertiesBase extends AbstractFullDistribZkTestBase {
- void doPropertyAction(CloudSolrServer client, String... paramsIn) throws IOException, SolrServerException {
+ NamedList<Object> doPropertyAction(CloudSolrServer client, String... paramsIn) throws IOException, SolrServerException {
assertTrue("paramsIn must be an even multiple of 2, it is: " + paramsIn.length, (paramsIn.length % 2) == 0);
ModifiableSolrParams params = new ModifiableSolrParams();
for (int idx = 0; idx < paramsIn.length; idx += 2) {
@@ -47,8 +48,7 @@ public abstract class ReplicaPropertiesB
}
QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
- client.request(request);
-
+ return client.request(request);
}
void verifyPropertyNotPresent(CloudSolrServer client, String collectionName, String replicaName,
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=1646904&r1=1646903&r2=1646904&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 Sat Dec 20 00:17:48 2014
@@ -193,11 +193,17 @@ public class TestReplicaProperties exten
// leaders _also_ have the preferredLeader property set.
- doPropertyAction(client,
- "action", CollectionParams.CollectionAction.REBALANCELEADERS.toString(),
- "collection", COLLECTION_NAME);
+ 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"));
+ }
- verifyLeaderAssignment(client, COLLECTION_NAME);
+// verifyLeaderAssignment(client, COLLECTION_NAME);
} finally {
client.shutdown();