Updated Branches: refs/heads/trunk 8b908c0ac -> 62295f68c
another try at fixing the broken testMutateLevel test Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62295f68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62295f68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62295f68 Branch: refs/heads/trunk Commit: 62295f68c7b7b10cc7d41d72f0817e17133a9b36 Parents: 8b908c0 Author: Marcus Eriksson <marc...@spotify.com> Authored: Tue Jun 18 17:57:22 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Tue Jun 18 17:57:22 2013 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/LeveledCompactionStrategyTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62295f68/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java index b33defc..d332ec3 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -18,6 +18,7 @@ package org.apache.cassandra.db.compaction; import java.nio.ByteBuffer; +import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -173,10 +174,11 @@ public class LeveledCompactionStrategyTest extends SchemaLoader cfs.forceBlockingFlush(); } waitForLeveling(cfs); + cfs.forceBlockingFlush(); LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) cfs.getCompactionStrategy(); cfs.disableAutoCompaction(); - while(CompactionManager.instance.getActiveCompactions() > 0) + while(CompactionManager.instance.isCompacting(Arrays.asList(cfs))) Thread.sleep(100); for (SSTableReader s : cfs.getSSTables())