Merge branch 'cassandra-3.0' into cassandra-3.11

2017-04-26 09:39:41 +02:00 · 2017-04-26 09:39:41 +02:00 · 6679b085a3
parent 2369faab79 8dbf808c3d
commit 6679b085a3
1 changed files with 1 additions and 1 deletions
--- a/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java
@ -80,7 +80,7 @@ public class NeverPurgeTest extends CQLTester
        execute("DELETE FROM %s WHERE a=3");
        cfs.forceBlockingFlush();
        cfs.enableAutoCompaction();
-        while (cfs.getLiveSSTables().size() > 1)
+        while (cfs.getLiveSSTables().size() > 1 || !cfs.getTracker().getCompacting().isEmpty())
            Thread.sleep(100);
        verifyContainsTombstones(cfs.getLiveSSTables(), 3);
    }