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 2012/01/04 21:01:43 UTC
svn commit: r1227291 - in /lucene/dev/branches/solrcloud/solr:
core/src/test/org/apache/solr/cloud/ test-framework/src/java/org/apache/solr/
Author: markrmiller
Date: Wed Jan 4 20:01:42 2012
New Revision: 1227291
URL: http://svn.apache.org/viewvc?rev=1227291&view=rev
Log:
test improvements
Removed:
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ZkLockTest.java
Modified:
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java?rev=1227291&r1=1227290&r2=1227291&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java Wed Jan 4 20:01:42 2012
@@ -41,8 +41,8 @@ public class ChaosMonkeySolrCloudTest ex
public ChaosMonkeySolrCloudTest() {
super();
- shardCount = 12;
- sliceCount = 3;
+ shardCount = atLeast(9);
+ sliceCount = atLeast(3);
}
@Override
@@ -53,7 +53,7 @@ public class ChaosMonkeySolrCloudTest ex
handle.put("timestamp", SKIPVAL);
List<StopableIndexingThread> threads = new ArrayList<StopableIndexingThread>();
- for (int i = 0; i < 3; i++) {
+ for (int i = 0; i < atLeast(2); i++) {
StopableIndexingThread indexThread = new StopableIndexingThread(i * 50000, true);
threads.add(indexThread);
indexThread.start();
@@ -61,7 +61,7 @@ public class ChaosMonkeySolrCloudTest ex
chaosMonkey.startTheMonkey();
- Thread.sleep(48000);
+ Thread.sleep(atLeast(12000));
chaosMonkey.stopTheMonkey();
@@ -80,7 +80,7 @@ public class ChaosMonkeySolrCloudTest ex
// try and wait for any replications and what not to finish...
- Thread.sleep(2000);
+ Thread.sleep(1000);
// wait until there are no recoveries...
waitForRecoveriesToFinish(VERBOSE);
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java?rev=1227291&r1=1227290&r2=1227291&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java Wed Jan 4 20:01:42 2012
@@ -1095,7 +1095,6 @@ public class FullSolrCloudTest extends A
}
clients.clear();
jettys.clear();
- Thread.sleep(10000);
}
protected SolrServer createNewSolrServer(int port) {
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java?rev=1227291&r1=1227290&r2=1227291&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java Wed Jan 4 20:01:42 2012
@@ -28,10 +28,6 @@ import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * TODO: Why do we see add fails but it still matches control? Because its successful
- * locally and gets picked up in distrib search...
- */
public class RecoveryZkTest extends FullSolrCloudTest {
//private static final String DISTRIB_UPDATE_CHAIN = "distrib-update-chain";
@@ -70,7 +66,7 @@ public class RecoveryZkTest extends Full
indexThread2.start();
// give some time to index...
- Thread.sleep(4000);
+ Thread.sleep(atLeast(2000));
// bring shard replica down
System.out.println("bring shard down");
@@ -78,7 +74,7 @@ public class RecoveryZkTest extends Full
// wait a moment - lets allow some docs to be indexed so replication time is non 0
- Thread.sleep(4000);
+ Thread.sleep(atLeast(2000));
// bring shard replica up
replica.start();
@@ -92,8 +88,6 @@ public class RecoveryZkTest extends Full
indexThread.join();
indexThread2.join();
-
- System.out.println("commit");
commit();
// test that leader and replica have same doc count
Modified: lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1227291&r1=1227290&r2=1227291&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Wed Jan 4 20:01:42 2012
@@ -229,7 +229,6 @@ public abstract class BaseDistributedSea
for (JettySolrRunner jetty : jettys) jetty.stop();
clients.clear();
jettys.clear();
- Thread.sleep(5000);
}
public JettySolrRunner createJetty(File baseDir, String dataDir) throws Exception {