[cassandra] branch cassandra-4.0 updated: Fix flaky CompactionsCQLTest by reseting the commitlog

[adelapena]

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
     new 52f6ac4af9 Fix flaky CompactionsCQLTest by reseting the commitlog
52f6ac4af9 is described below

commit 52f6ac4af91bdda4e177fdfc6342944047ab2e3c
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Tue May 31 12:27:16 2022 +0100

    Fix flaky CompactionsCQLTest by reseting the commitlog
    
    patch by Andrés de la Peña; reviewed by Brandon Williams for CASSANDRA-17609
---
 .../org/apache/cassandra/db/compaction/CompactionsCQLTest.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java 
b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
index 48caef6eef..e1695481d0 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.cassandra.db.compaction;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.HashMap;
@@ -41,6 +42,7 @@ import org.apache.cassandra.db.Mutation;
 import org.apache.cassandra.db.RangeTombstone;
 import org.apache.cassandra.db.RowUpdateBuilder;
 import org.apache.cassandra.db.Slice;
+import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.db.compaction.writers.CompactionAwareWriter;
 import org.apache.cassandra.db.compaction.writers.MaxSSTableSizeWriter;
 import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
@@ -63,24 +65,24 @@ import static org.junit.Assert.fail;
 
 public class CompactionsCQLTest extends CQLTester
 {
-
     public static final int SLEEP_TIME = 5000;
 
     private Config.CorruptedTombstoneStrategy strategy;
 
     @Before
-    public void before()
+    public void before() throws IOException
     {
         strategy = DatabaseDescriptor.getCorruptedTombstoneStrategy();
+        
+        CommitLog.instance.resetUnsafe(true);
     }
 
     @After
     public void after()
     {
-        
DatabaseDescriptor.setCorruptedTombstoneStrategy(DatabaseDescriptor.getCorruptedTombstoneStrategy());
+        DatabaseDescriptor.setCorruptedTombstoneStrategy(strategy);
     }
 
-
     @Test
     public void testTriggerMinorCompactionSTCS() throws Throwable
     {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org