honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not lose CacheTest failure stack traces

This commit is contained in:
Jason Tedor 2016-01-06 20:00:11 -05:00
parent 4c0f5bda47
commit c147fe5691
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/test/java/org/elasticsearch/common/cache/CacheTests.java vendored
View File

@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier; import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -44,6 +45,8 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
public class CacheTests extends ESTestCase { public class CacheTests extends ESTestCase {
private int numberOfEntries; private int numberOfEntries;
@ -485,7 +488,7 @@ public class CacheTests extends ESTestCase {
return value; return value;
}); });
} catch (ExecutionException e) { } catch (ExecutionException e) {
fail(e.getMessage()); throw new AssertionError(e);
} }
} }
for (int i = 0; i < numberOfEntries; i++) { for (int i = 0; i < numberOfEntries; i++) {
@ -501,6 +504,8 @@ public class CacheTests extends ESTestCase {
flags.set(j, false); flags.set(j, false);
} }
CopyOnWriteArrayList<ExecutionException> failures = new CopyOnWriteArrayList<>();
CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads); CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads);
for (int i = 0; i < numberOfThreads; i++) { for (int i = 0; i < numberOfThreads; i++) {
Thread thread = new Thread(() -> { Thread thread = new Thread(() -> {
@ -513,7 +518,8 @@ public class CacheTests extends ESTestCase {
return Integer.toString(key); return Integer.toString(key);
}); });
} catch (ExecutionException e) { } catch (ExecutionException e) {
fail(e.getMessage()); failures.add(e);
break;
} }
} }
barrier.await(); barrier.await();
@ -528,6 +534,8 @@ public class CacheTests extends ESTestCase {
barrier.await(); barrier.await();
// wait for all threads to finish // wait for all threads to finish
barrier.await(); barrier.await();
assertThat(failures, is(empty()));
} }
public void testComputeIfAbsentThrowsExceptionIfLoaderReturnsANullValue() { public void testComputeIfAbsentThrowsExceptionIfLoaderReturnsANullValue() {
@ -568,6 +576,8 @@ public class CacheTests extends ESTestCase {
int numberOfThreads = randomIntBetween(2, 32); int numberOfThreads = randomIntBetween(2, 32);
final Cache<Key, Integer> cache = CacheBuilder.<Key, Integer>builder().build(); final Cache<Key, Integer> cache = CacheBuilder.<Key, Integer>builder().build();
CopyOnWriteArrayList<ExecutionException> failures = new CopyOnWriteArrayList<>();
CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads); CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads);
CountDownLatch deadlockLatch = new CountDownLatch(numberOfThreads); CountDownLatch deadlockLatch = new CountDownLatch(numberOfThreads);
List<Thread> threads = new ArrayList<>(); List<Thread> threads = new ArrayList<>();
@ -592,7 +602,8 @@ public class CacheTests extends ESTestCase {
} }
}); });
} catch (ExecutionException e) { } catch (ExecutionException e) {
fail(e.getMessage()); failures.add(e);
break;
} }
} }
} finally { } finally {
@ -637,6 +648,8 @@ public class CacheTests extends ESTestCase {
// shutdown the watchdog service // shutdown the watchdog service
scheduler.shutdown(); scheduler.shutdown();
assertThat(failures, is(empty()));
assertFalse("deadlock", deadlock.get()); assertFalse("deadlock", deadlock.get());
} }