From 361ad681ecdde12e299026ccee5e17c184f943d8 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 9 May 2014 10:12:16 -0500 Subject: [PATCH] More aggressive waiting in KeyCacheTest Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-7167 --- test/unit/org/apache/cassandra/db/KeyCacheTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/unit/org/apache/cassandra/db/KeyCacheTest.java b/test/unit/org/apache/cassandra/db/KeyCacheTest.java index e6745a1e27..c0560ab261 100644 --- a/test/unit/org/apache/cassandra/db/KeyCacheTest.java +++ b/test/unit/org/apache/cassandra/db/KeyCacheTest.java @@ -22,7 +22,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import com.google.common.util.concurrent.Uninterruptibles; import org.junit.AfterClass; import org.junit.Test; @@ -162,7 +164,8 @@ public class KeyCacheTest extends SchemaLoader for (SSTableReader reader : readers) reader.releaseReference(); - while (StorageService.tasks.getActiveCount() > 0); + Uninterruptibles.sleepUninterruptibly(10, TimeUnit.MILLISECONDS);; + while (StorageService.tasks.getActiveCount() + StorageService.tasks.getQueue().size() > 0); // after releasing the reference this should drop to 2 assertKeyCacheSize(2, KEYSPACE1, COLUMN_FAMILY1);