Updated Branches: refs/heads/cassandra-1.2 2fe8133bb -> e531be77a
Make CompactionsTest.testDontPurgeAccidentaly more reliable with gcgrace=0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e531be77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e531be77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e531be77 Branch: refs/heads/cassandra-1.2 Commit: e531be77a417e45d5a4f8fe7149b489d4e6cf3b1 Parents: 2fe8133 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Feb 13 11:54:59 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Feb 13 11:54:59 2013 +0100 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionsTest.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e531be77/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index e543b00..b41bf19 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -340,6 +340,9 @@ public class CompactionsTest extends SchemaLoader ColumnFamily cf = cfs.getColumnFamily(filter); assert cf == null || cf.isEmpty() : "should be empty: " + cf; + // Sleep one second so that the removal is indeed purgeable even with gcgrace == 0 + Thread.sleep(1000); + cfs.forceBlockingFlush(); Collection<SSTableReader> sstablesAfter = cfs.getSSTables();
