Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-10207: Harden CleanupOldIndexTest.

This commit is contained in:
markrmiller 2017-02-27 22:55:10 -05:00
parent 86b5b6330f
commit ed0f0f45ce
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
View File

@ -30,6 +30,7 @@ import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.core.CoreContainer; import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.SnapShooter; import org.apache.solr.handler.SnapShooter;
import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -44,6 +45,15 @@ public class CleanupOldIndexTest extends SolrCloudTestCase {
.addConfig("conf1", TEST_PATH().resolve("configsets").resolve("cloud-dynamic").resolve("conf")) .addConfig("conf1", TEST_PATH().resolve("configsets").resolve("cloud-dynamic").resolve("conf"))
.configure(); .configure();
} }
@AfterClass
public static void teardownTestCases() throws Exception {
if (suiteFailureMarker.wasSuccessful()) {
zkClient().printLayoutToStdOut();
}
}
private static final String COLLECTION = "oldindextest"; private static final String COLLECTION = "oldindextest";
@ -54,14 +64,14 @@ public class CleanupOldIndexTest extends SolrCloudTestCase {
.processAndWait(cluster.getSolrClient(), DEFAULT_TIMEOUT); .processAndWait(cluster.getSolrClient(), DEFAULT_TIMEOUT);
cluster.getSolrClient().setDefaultCollection(COLLECTION); // TODO make this configurable on StoppableIndexingThread cluster.getSolrClient().setDefaultCollection(COLLECTION); // TODO make this configurable on StoppableIndexingThread
int[] maxDocList = new int[] {300, 700, 1200}; int[] maxDocList = new int[] {300, 500, 700};
int maxDoc = maxDocList[random().nextInt(maxDocList.length - 1)]; int maxDoc = maxDocList[random().nextInt(maxDocList.length - 1)];
StoppableIndexingThread indexThread = new StoppableIndexingThread(null, cluster.getSolrClient(), "1", true, maxDoc, 1, true); StoppableIndexingThread indexThread = new StoppableIndexingThread(null, cluster.getSolrClient(), "1", true, maxDoc, 1, true);
indexThread.start(); indexThread.start();
// give some time to index... // give some time to index...
int[] waitTimes = new int[] {200, 2000, 3000}; int[] waitTimes = new int[] {3000, 4000};
Thread.sleep(waitTimes[random().nextInt(waitTimes.length - 1)]); Thread.sleep(waitTimes[random().nextInt(waitTimes.length - 1)]);
// create some "old" index directories // create some "old" index directories
@ -86,13 +96,13 @@ public class CleanupOldIndexTest extends SolrCloudTestCase {
assertTrue(oldIndexDir2.isDirectory()); assertTrue(oldIndexDir2.isDirectory());
// bring shard replica down // bring shard replica down
jetty.stop(); ChaosMonkey.stop(jetty);
// wait a moment - lets allow some docs to be indexed so replication time is non 0 // wait a moment - lets allow some docs to be indexed so replication time is non 0
Thread.sleep(waitTimes[random().nextInt(waitTimes.length - 1)]); Thread.sleep(waitTimes[random().nextInt(waitTimes.length - 1)]);
// bring shard replica up // bring shard replica up
jetty.start(); ChaosMonkey.start(jetty);
// make sure replication can start // make sure replication can start
Thread.sleep(3000); Thread.sleep(3000);