You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/09 17:13:17 UTC
[1/3] git commit: More aggressive waiting in KeyCacheTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 259e17df3 -> 361ad681e
refs/heads/trunk b7d5f5a16 -> 17afc08d6
More aggressive waiting in KeyCacheTest
Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-7167
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/361ad681
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/361ad681
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/361ad681
Branch: refs/heads/cassandra-2.1
Commit: 361ad681ecdde12e299026ccee5e17c184f943d8
Parents: 259e17d
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 9 10:12:16 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 9 10:12:16 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/KeyCacheTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/361ad681/test/unit/org/apache/cassandra/db/KeyCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyCacheTest.java b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
index e6745a1..c0560ab 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);
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17afc08d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17afc08d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17afc08d
Branch: refs/heads/trunk
Commit: 17afc08d6eea030655784b87ebef493ede69747b
Parents: b7d5f5a 361ad68
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 9 10:13:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 9 10:13:08 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/KeyCacheTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: More aggressive waiting in KeyCacheTest
Posted by br...@apache.org.
More aggressive waiting in KeyCacheTest
Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-7167
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/361ad681
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/361ad681
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/361ad681
Branch: refs/heads/trunk
Commit: 361ad681ecdde12e299026ccee5e17c184f943d8
Parents: 259e17d
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 9 10:12:16 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 9 10:12:16 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/KeyCacheTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/361ad681/test/unit/org/apache/cassandra/db/KeyCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyCacheTest.java b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
index e6745a1..c0560ab 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);