all accord tests now ignore journal issue

Author: dcapwell

test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropMultiNodeTableWalkBase.java

@@ -18,6 +18,7 @@
 
 package org.apache.cassandra.distributed.test.cql3;
 
+import accord.utils.Property;
 import accord.utils.RandomSource;
 import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.distributed.api.ConsistencyLevel;
@@ -31,6 +32,12 @@ public AccordInteropMultiNodeTableWalkBase(TransactionalMode transactionalMode)
         super(transactionalMode);
     }
 
+    @Override
+    protected void preCheck(Cluster cluster, Property.StatefulBuilder builder)
+    {
+        AccordInteropSingleNodeTableWalkBase.addUncaughtExceptionsFilter(cluster);
+    }
+
     @Override
     protected State createState(RandomSource rs, Cluster cluster)
     {

test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropSingleNodeTableWalkBase.java

@@ -34,10 +34,28 @@ public AccordInteropSingleNodeTableWalkBase(TransactionalMode transactionalMode)
     @Override
     protected void preCheck(Cluster cluster, Property.StatefulBuilder builder)
     {
-        // if a failing seed is detected, populate here
-        // Example: builder.withSeed(42L);
-        // CQL operations may have opertors such as +, -, and / (example 4 + 4), to "apply" them to get a constant value
-        // CQL_DEBUG_APPLY_OPERATOR = true;
+        addUncaughtExceptionsFilter(cluster);
+    }
+
+    static void addUncaughtExceptionsFilter(Cluster cluster)
+    {
+        cluster.setUncaughtExceptionsFilter(t -> {
+            // There is a known issue with drop table and journal snapshots where the journal can't find the given table...
+            // To make these tests stable need to ignore this error as it's unrelated to the test and is target to be fixed
+            // directly.
+            /*
+Suppressed: java.lang.AssertionError: Unknown keyspace ks12
+		at org.apache.cassandra.db.Keyspace.open(Keyspace.java:149)
+		at org.apache.cassandra.db.Keyspace.openAndGetStoreIfExists(Keyspace.java:172)
+		at org.apache.cassandra.service.accord.AccordDataStore.lambda$snapshot$2(AccordDataStore.java:104)
+             */
+
+            if (t instanceof AssertionError
+                && t.getMessage() != null
+                && t.getMessage().startsWith("Unknown keyspace ks"))
+                return true;
+            return false;
+        });
     }
 
     @Override

test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropSingleNodeTokenConflictTest.java

@@ -18,15 +18,12 @@
 
 package org.apache.cassandra.distributed.test.cql3;
 
-import org.junit.Ignore;
-
 import accord.utils.Property;
 import accord.utils.RandomSource;
 import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.distributed.api.ConsistencyLevel;
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
-@Ignore
 public class AccordInteropSingleNodeTokenConflictTest extends SingleNodeTokenConflictTest
 {
     public AccordInteropSingleNodeTokenConflictTest()

test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropMultiNodeTableWalkTest.java

@@ -32,23 +32,7 @@ public FullAccordInteropMultiNodeTableWalkTest()
     @Override
     protected void preCheck(Cluster cluster, Property.StatefulBuilder builder)
     {
-        cluster.setUncaughtExceptionsFilter(t -> {
-            // There is a known issue with drop table and journal snapshots where the journal can't find the given table...
-            // To make these tests stable need to ignore this error as it's unrelated to the test and is target to be fixed
-            // directly.
-            /*
-Suppressed: java.lang.AssertionError: Unknown keyspace ks12
-		at org.apache.cassandra.db.Keyspace.open(Keyspace.java:149)
-		at org.apache.cassandra.db.Keyspace.openAndGetStoreIfExists(Keyspace.java:172)
-		at org.apache.cassandra.service.accord.AccordDataStore.lambda$snapshot$2(AccordDataStore.java:104)
-             */
-
-            if (t instanceof AssertionError
-                && t.getMessage() != null
-                && t.getMessage().startsWith("Unknown keyspace ks"))
-                return true;
-            return false;
-        });
+        super.preCheck(cluster, builder);
         // if a failing seed is detected, populate here
         // Example: builder.withSeed(42L);
         // CQL operations may have opertors such as +, -, and / (example 4 + 4), to "apply" them to get a constant value

test/distributed/org/apache/cassandra/distributed/test/cql3/FullAccordInteropSingleNodeTableWalkTest.java

@@ -32,6 +32,7 @@ public FullAccordInteropSingleNodeTableWalkTest()
     @Override
     protected void preCheck(Cluster cluster, Property.StatefulBuilder builder)
     {
+        super.preCheck(cluster, builder);
         // if a failing seed is detected, populate here
         // Example: builder.withSeed(42L);
         // CQL operations may have opertors such as +, -, and / (example 4 + 4), to "apply" them to get a constant value

test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropMultiNodeTableWalkTest.java

@@ -32,6 +32,7 @@ public MixedReadsAccordInteropMultiNodeTableWalkTest()
     @Override
     protected void preCheck(Cluster cluster, Property.StatefulBuilder builder)
     {
+        super.preCheck(cluster, builder);
         // if a failing seed is detected, populate here
         // Example: builder.withSeed(42L);
         // CQL operations may have opertors such as +, -, and / (example 4 + 4), to "apply" them to get a constant value

test/distributed/org/apache/cassandra/distributed/test/cql3/MixedReadsAccordInteropSingleNodeTableWalkTest.java

@@ -32,6 +32,7 @@ public MixedReadsAccordInteropSingleNodeTableWalkTest()
     @Override
     protected void preCheck(Cluster cluster, Property.StatefulBuilder builder)
     {
+        super.preCheck(cluster, builder);
         // if a failing seed is detected, populate here
         // Example: builder.withSeed(42L);
         // CQL operations may have opertors such as +, -, and / (example 4 + 4), to "apply" them to get a constant value