You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/20 06:03:14 UTC
svn commit: r1579539 - in /lucene/dev/trunk/solr:
core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
core/src/test/org/apache/solr/cloud/SyncSliceTest.java
test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Author: markrmiller
Date: Thu Mar 20 05:03:14 2014
New Revision: 1579539
URL: http://svn.apache.org/r1579539
Log:
SOLR-5888: Speed up SyncSliceTest as well as some other tests.
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java?rev=1579539&r1=1579538&r2=1579539&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java Thu Mar 20 05:03:14 2014
@@ -313,7 +313,7 @@ public class ChaosMonkeyNothingIsSafeTes
try {
numAdds++;
- if (numAdds > 4000)
+ if (numAdds > (TEST_NIGHTLY ? 4002 : 197))
continue;
SolrInputDocument doc = getDoc(
"id",
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java?rev=1579539&r1=1579538&r2=1579539&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java Thu Mar 20 05:03:14 2014
@@ -164,10 +164,10 @@ public class SyncSliceTest extends Abstr
assertEquals(shardCount - 1, jetties.size());
chaosMonkey.killJetty(leaderJetty);
-
- Thread.sleep(2000);
- waitForThingsToLevelOut(120);
+ Thread.sleep(3000);
+
+ waitForNoShardInconsistency();
Thread.sleep(1000);
@@ -187,7 +187,7 @@ public class SyncSliceTest extends Abstr
// bring back dead node
ChaosMonkey.start(deadJetty.jetty); // he is not the leader anymore
- waitTillRecovered();
+ waitTillAllNodesActive();
skipServers = getRandomOtherJetty(leaderJetty, deadJetty);
skipServers.addAll( getRandomOtherJetty(leaderJetty, deadJetty));
@@ -228,20 +228,14 @@ public class SyncSliceTest extends Abstr
// kill the current leader
chaosMonkey.killJetty(leaderJetty);
- Thread.sleep(3000);
-
- waitForThingsToLevelOut(120);
-
- Thread.sleep(2000);
-
- waitForRecoveriesToFinish(false);
+ waitForNoShardInconsistency();
checkShardConsistency(true, true);
success = true;
}
- private void waitTillRecovered() throws Exception {
+ private void waitTillAllNodesActive() throws Exception {
for (int i = 0; i < 60; i++) {
Thread.sleep(3000);
ZkStateReader zkStateReader = cloudClient.getZkStateReader();
@@ -264,7 +258,7 @@ public class SyncSliceTest extends Abstr
}
}
printLayout();
- fail("timeout waiting to see recovered node");
+ fail("timeout waiting to see all nodes active");
}
private String waitTillInconsistent() throws Exception, InterruptedException {
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1579539&r1=1579538&r2=1579539&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Thu Mar 20 05:03:14 2014
@@ -1510,7 +1510,43 @@ public abstract class AbstractFullDistri
}
if (failMessage != null) {
- retry = true;
+ log.info("shard inconsistency - waiting ...");
+ retry = true;
+ } else {
+ retry = false;
+ }
+ cnt++;
+ if (cnt > 20) break;
+ Thread.sleep(2000);
+ } while (retry);
+ }
+
+
+ public void waitForNoShardInconsistency() throws Exception {
+ log.info("Wait for no shard inconsistency");
+ int cnt = 0;
+ boolean retry = false;
+ do {
+ try {
+ commit();
+ } catch (Throwable t) {
+ t.printStackTrace();
+ // we don't care if this commit fails on some nodes
+ }
+
+ updateMappingsFromZk(jettys, clients);
+
+ Set<String> theShards = shardToJetty.keySet();
+ String failMessage = null;
+ for (String shard : theShards) {
+ failMessage = checkShardConsistency(shard, true, false);
+ }
+
+ if (failMessage != null) {
+ log.info("shard inconsistency - waiting ...");
+ retry = true;
+ } else {
+ retry = false;
}
cnt++;
if (cnt > 20) break;