You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2013/10/30 13:12:15 UTC
svn commit: r1537061 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
Author: noble
Date: Wed Oct 30 12:12:15 2013
New Revision: 1537061
URL: http://svn.apache.org/r1537061
Log:
SOLR-5311 tests were failing intermittently
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java?rev=1537061&r1=1537060&r2=1537061&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java Wed Oct 30 12:12:15 2013
@@ -28,7 +28,10 @@ import org.apache.solr.common.cloud.ZkSt
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.NamedList;
+import java.net.URL;
import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.Future;
import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
@@ -43,11 +46,38 @@ public class DeleteInactiveReplicaTest e
CloudSolrServer client = createCloudClient(null);
createCloudClient(null);
createColl(COLL_NAME, client);
+
+ boolean stopped = false;
+ JettySolrRunner stoppedJetty = null;
+ StringBuilder sb = new StringBuilder();
+ Replica replica1=null;
+ Slice shard1 = null;
DocCollection testcoll = getCommonCloudSolrServer().getZkStateReader().getClusterState().getCollection(COLL_NAME);
- final Slice shard1 = testcoll.getSlices().iterator().next();
+ for (JettySolrRunner jetty : jettys) sb.append(jetty.getBaseUrl()).append(",");
+
+ for (Slice slice : testcoll.getActiveSlices()) {
+ for (Replica replica : slice.getReplicas())
+ for (JettySolrRunner jetty : jettys) {
+ URL baseUrl = null;
+ try {
+ baseUrl = jetty.getBaseUrl();
+ } catch (Exception e) {
+ continue;
+ }
+ if (baseUrl.toString().startsWith(replica.getStr(ZkStateReader.BASE_URL_PROP))) {
+ stoppedJetty = jetty;
+ ChaosMonkey.stop(jetty);
+ replica1 = replica;
+ shard1 = slice;
+ stopped = true;
+ break;
+ }
+ }
+ }
+
+ /*final Slice shard1 = testcoll.getSlices().iterator().next();
if(!shard1.getState().equals(Slice.ACTIVE)) fail("shard is not active");
Replica replica1 = shard1.getReplicas().iterator().next();
- boolean stopped = false;
JettySolrRunner stoppedJetty = null;
StringBuilder sb = new StringBuilder();
for (JettySolrRunner jetty : jettys) {
@@ -58,9 +88,9 @@ public class DeleteInactiveReplicaTest e
stopped = true;
break;
}
- }
+ }*/
if(!stopped){
- fail("Could not find jetty for replica "+ replica1 + "jettys: "+sb);
+ fail("Could not find jetty to stop in collection "+ testcoll + " jettys: "+sb);
}
long endAt = System.currentTimeMillis()+3000;