Skip to content

CASSANDRA-21163 - Fix flaky test2DeleteRangeWithOverlapingBoundAndSameTimestampCompaction #4608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samueldlightfoot wants to merge 1 commit into
base: trunk
Choose a base branch
from
+12 −4
Open

CASSANDRA-21163 - Fix flaky test2DeleteRangeWithOverlapingBoundAndSameTimestampCompaction #4608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions test/unit/org/apache/cassandra/db/compaction/simple/CompactionDeleteRowRangeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.junit.Test;

import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
Expand All @@ -32,6 +33,7 @@
import org.apache.cassandra.db.rows.UnfilteredRowIterator;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.utils.FBUtilities;

import static org.apache.cassandra.utils.TestHelper.verifyAndPrint;
import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -330,8 +332,13 @@ public void test2DeleteRangeWithOverlapingBoundAndSameTimestampCompaction() thro
ColumnFamilyStore cfs = Keyspace.open(keyspace).getColumnFamilyStore(table);
cfs.disableAutoCompaction();

// Use a fixed nowInSec for both deletes so they get the same local_delete_time,
// ensuring compaction merges the overlapping range tombstones deterministically.
long nowInSec = FBUtilities.nowInSeconds();

// Delete
execute("DELETE FROM " + table + " using timestamp 2 WHERE pk = ? AND ck1 = ? AND ck2 <= ?;",
QueryProcessor.executeInternalWithNowInSec("DELETE FROM " + table + " using timestamp 2 WHERE pk = ? AND ck1 = ? AND ck2 <= ?;",
nowInSec,
Long.valueOf(0), //pk
Long.valueOf(0), //ck1
Integer.valueOf(3) //ck2
Expand All @@ -340,7 +347,8 @@ public void test2DeleteRangeWithOverlapingBoundAndSameTimestampCompaction() thro
cfs.forceBlockingFlush(ColumnFamilyStore.FlushReason.USER_FORCED);

// Delete
execute("DELETE FROM " + table + " using timestamp 2 WHERE pk = ? AND ck1 = ? AND ck2 >= ?;",
QueryProcessor.executeInternalWithNowInSec("DELETE FROM " + table + " using timestamp 2 WHERE pk = ? AND ck1 = ? AND ck2 >= ?;",
nowInSec,
Long.valueOf(0), //pk
Long.valueOf(0), //ck1
Integer.valueOf(0) //ck2
Expand All @@ -367,13 +375,13 @@ public void test2DeleteRangeWithOverlapingBoundAndSameTimestampCompaction() thro
assertTrue(partition.staticRow().isEmpty());
Unfiltered tombstoneMarker = partition.next();
assertTrue(tombstoneMarker.isRangeTombstoneMarker());
assertTrue(!((RangeTombstoneMarker)tombstoneMarker).isBoundary());
assertFalse(((RangeTombstoneMarker) tombstoneMarker).isBoundary());
assertTrue(((RangeTombstoneBoundMarker)tombstoneMarker).openIsInclusive(false));
assertEquals(2, ((RangeTombstoneBoundMarker)tombstoneMarker).deletionTime().markedForDeleteAt());

tombstoneMarker = partition.next();
assertTrue(tombstoneMarker.isRangeTombstoneMarker());
assertTrue(!((RangeTombstoneMarker)tombstoneMarker).isBoundary());
assertFalse(((RangeTombstoneMarker) tombstoneMarker).isBoundary());
assertTrue(((RangeTombstoneMarker)tombstoneMarker).closeIsInclusive(false));
assertEquals(2, ((RangeTombstoneBoundMarker)tombstoneMarker).deletionTime().markedForDeleteAt());
assertFalse(partition.hasNext());
Expand Down