You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2014/09/19 23:03:23 UTC
svn commit: r1626330 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
Author: anshum
Date: Fri Sep 19 21:03:23 2014
New Revision: 1626330
URL: http://svn.apache.org/r1626330
Log:
SOLR-6544: Fix extra iterations and unwanted arguments in helper methods in DeleteReplicaTest (Merge from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java?rev=1626330&r1=1626329&r2=1626330&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java Fri Sep 19 21:03:23 2014
@@ -101,11 +101,19 @@ public class DeleteReplicaTest extends A
Slice shard1 = null;
Replica replica1 = null;
+
+ // Get an active replica
for (Slice slice : testcoll.getSlices()) {
+ if(replica1 != null)
+ break;
if ("active".equals(slice.getStr("state"))) {
shard1 = slice;
- for (Replica replica : shard1.getReplicas())
- if ("active".equals(replica.getStr("state"))) replica1 = replica;
+ for (Replica replica : shard1.getReplicas()) {
+ if ("active".equals(replica.getStr("state"))) {
+ replica1 = replica;
+ break;
+ }
+ }
}
}
@@ -122,7 +130,7 @@ public class DeleteReplicaTest extends A
}
try {
// Should not be able to delete a replica that is up if onlyIfDown=true.
- tryToRemoveOnlyIfDown(collectionName, client, replica1, shard1.getName(), dataDir);
+ tryToRemoveOnlyIfDown(collectionName, client, replica1, shard1.getName());
fail("Should have thrown an exception here because the replica is NOT down");
} catch (SolrException se) {
assertEquals("Should see 400 here ", se.code(), 400);
@@ -133,16 +141,14 @@ public class DeleteReplicaTest extends A
new File(dataDir).exists());
}
-
- removeAndWaitForReplicaGone(collectionName, client, replica1,
- shard1.getName());
+ removeAndWaitForReplicaGone(collectionName, client, replica1, shard1.getName());
assertFalse("dataDir for " + replica1.getName() + " should have been deleted by deleteReplica API", new File(dataDir).exists());
} finally {
client.shutdown();
}
}
- protected void tryToRemoveOnlyIfDown(String collectionName, CloudSolrServer client, Replica replica, String shard, String dataDir) throws IOException, SolrServerException {
+ protected void tryToRemoveOnlyIfDown(String collectionName, CloudSolrServer client, Replica replica, String shard) throws IOException, SolrServerException {
Map m = makeMap("collection", collectionName,
"action", DELETEREPLICA.toLower(),
"shard", shard,
@@ -151,7 +157,7 @@ public class DeleteReplicaTest extends A
SolrParams params = new MapSolrParams(m);
SolrRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
- NamedList<Object> resp = client.request(request);
+ client.request(request);
}
protected void removeAndWaitForReplicaGone(String COLL_NAME,