honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 22:45:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TEST] ensure exceptions won't cause test to hang

Browse Source
This commit is contained in:
Simon Willnauer 2015-07-13 12:29:50 +02:00
parent 2e2bb25205
commit 9faa3c6756
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasTests.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.index; package org.elasticsearch.index;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
@ -49,6 +50,7 @@ import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@ -317,7 +319,7 @@ public class IndexWithShadowReplicasTests extends ElasticsearchIntegrationTest {
} }
@Test @Test
public void testPrimaryRelocationWithConcurrentIndexing() throws Exception { public void testPrimaryRelocationWithConcurrentIndexing() throws Throwable {
Settings nodeSettings = nodeSettings(); Settings nodeSettings = nodeSettings();
String node1 = internalCluster().startNode(nodeSettings); String node1 = internalCluster().startNode(nodeSettings);
@ -346,15 +348,19 @@ public class IndexWithShadowReplicasTests extends ElasticsearchIntegrationTest {
final int numPhase2Docs = scaledRandomIntBetween(25, 200); final int numPhase2Docs = scaledRandomIntBetween(25, 200);
final CountDownLatch phase1finished = new CountDownLatch(1); final CountDownLatch phase1finished = new CountDownLatch(1);
final CountDownLatch phase2finished = new CountDownLatch(1); final CountDownLatch phase2finished = new CountDownLatch(1);
final CopyOnWriteArrayList<Throwable> exceptions = new CopyOnWriteArrayList<>();
Thread thread = new Thread() { Thread thread = new Thread() {
@Override @Override
public void run() { public void run() {
started.countDown(); started.countDown();
while (counter.get() < (numPhase1Docs + numPhase2Docs)) { while (counter.get() < (numPhase1Docs + numPhase2Docs)) {
try {
final IndexResponse indexResponse = client().prepareIndex(IDX, "doc", final IndexResponse indexResponse = client().prepareIndex(IDX, "doc",
Integer.toString(counter.incrementAndGet())).setSource("foo", "bar").get(); Integer.toString(counter.incrementAndGet())).setSource("foo", "bar").get();
assertTrue(indexResponse.isCreated()); assertTrue(indexResponse.isCreated());
} catch (Throwable t) {
exceptions.add(t);
}
final int docCount = counter.get(); final int docCount = counter.get();
if (docCount == numPhase1Docs) { if (docCount == numPhase1Docs) {
phase1finished.countDown(); phase1finished.countDown();
@ -374,6 +380,7 @@ public class IndexWithShadowReplicasTests extends ElasticsearchIntegrationTest {
// wait for more documents to be indexed post-recovery, also waits for // wait for more documents to be indexed post-recovery, also waits for
// indexing thread to stop // indexing thread to stop
phase2finished.await(); phase2finished.await();
ExceptionsHelper.rethrowAndSuppress(exceptions);
ensureGreen(IDX); ensureGreen(IDX);
thread.join(); thread.join();
logger.info("--> performing query"); logger.info("--> performing query");