Fix flaky GcCompactionTest Patch by Branimir Lambov; reviewed by Stefania Alborghetti for CASSANDRA-12664
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/237e14dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/237e14dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/237e14dd Branch: refs/heads/trunk Commit: 237e14dd99cf3975d54cb1e41126c40bc183f3b4 Parents: 6016067 Author: Branimir Lambov <branimir.lam...@datastax.com> Authored: Mon Jan 23 17:42:19 2017 +0200 Committer: Branimir Lambov <branimir.lam...@datastax.com> Committed: Wed Jan 25 10:10:43 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/GcCompactionTest.java | 25 ++++++++++++++++++++ 2 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/237e14dd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2f0e8f1..55762e2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.10 + * Fix flaky GcCompactionTest (CASSANDRA-12664) * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058) * Fixed query monitoring for range queries (CASSANDRA-13050) * Remove outboundBindAny configuration property (CASSANDRA-12673) http://git-wip-us.apache.org/repos/asf/cassandra/blob/237e14dd/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java b/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java index 6fed033..a31b9a1 100644 --- a/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java +++ b/test/unit/org/apache/cassandra/cql3/GcCompactionTest.java @@ -41,6 +41,31 @@ public class GcCompactionTest extends CQLTester static final int KEY_COUNT = 10; static final int CLUSTERING_COUNT = 20; + // Test needs synchronous table drop to avoid flushes causing flaky failures + + @Override + protected String createTable(String query) + { + return super.createTable(KEYSPACE_PER_TEST, query); + } + + @Override + protected UntypedResultSet execute(String query, Object... values) throws Throwable + { + return executeFormattedQuery(formatQuery(KEYSPACE_PER_TEST, query), values); + } + + @Override + public ColumnFamilyStore getCurrentColumnFamilyStore() + { + return super.getCurrentColumnFamilyStore(KEYSPACE_PER_TEST); + } + + public void flush() + { + flush(KEYSPACE_PER_TEST); + } + @Test public void testGcCompactionPartitions() throws Throwable {
