got in-sync with trunk

Author: dcapwell

test/distributed/org/apache/cassandra/distributed/test/JavaDriverUtils.java

@@ -36,6 +36,11 @@ private JavaDriverUtils()
     {
     }
 
+    public static com.datastax.driver.core.Cluster create(ICluster<? extends IInstance> dtest, Consumer<com.datastax.driver.core.Cluster.Builder> overrideBuilder)
+    {
+        return create(dtest, null, overrideBuilder);
+    }
+
     public static com.datastax.driver.core.Cluster create(ICluster<? extends IInstance> dtest)
     {
         return create(dtest, null, null);
@@ -94,8 +99,10 @@ public static ConsistencyLevel toDriverCL(org.apache.cassandra.distributed.api.C
             case EACH_QUORUM: return ConsistencyLevel.EACH_QUORUM;
             case ANY: return ConsistencyLevel.ANY;
             case ALL: return ConsistencyLevel.ALL;
+            case NODE_LOCAL:
+                throw new AssertionError("NODE_LOCAL is not supported by driver and should go directly through jvm-dtest api");
             default:
-                throw new UnsupportedOperationException(cl.name());
+                throw new UnsupportedOperationException("Unknown ConsistencyLevel: " + cl);
         }
     }
 }

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

@@ -18,7 +18,6 @@
 
 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;
@@ -32,13 +31,6 @@ public AccordInteropMultiNodeTableWalkBase(TransactionalMode transactionalMode)
         super(transactionalMode);
     }
 
-    @Override
-    protected void preCheck(Property.StatefulBuilder builder)
-    {
-        // if a failing seed is detected, populate here
-        // Example: builder.withSeed(42L);
-    }
-
     @Override
     protected State createState(RandomSource rs, Cluster cluster)
     {

test/distributed/org/apache/cassandra/distributed/test/cql3/AccordInteropSingleNodeTableWalkBase.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;
@@ -30,6 +31,15 @@ public AccordInteropSingleNodeTableWalkBase(TransactionalMode transactionalMode)
         super(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;
+    }
+
     @Override
     protected State createState(RandomSource rs, Cluster cluster)
     {

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

@@ -42,7 +42,7 @@ protected void preCheck(Property.StatefulBuilder builder)
     }
 
     @Override
-    protected State createState(Cluster cluster, RandomSource rs)
+    protected State createState(RandomSource rs, Cluster cluster)
     {
         return new AccordInteropState(rs, cluster);
     }

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

@@ -19,6 +19,7 @@
 package org.apache.cassandra.distributed.test.cql3;
 
 import accord.utils.Property;
+import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
 public class FullAccordInteropMultiNodeTableWalkTest extends AccordInteropMultiNodeTableWalkBase
@@ -29,9 +30,30 @@ public FullAccordInteropMultiNodeTableWalkTest()
     }
 
     @Override
-    protected void preCheck(Property.StatefulBuilder builder)
+    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;
+        });
         // 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;
+
+        builder.withExamples(50);
     }
 }

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

@@ -19,6 +19,7 @@
 package org.apache.cassandra.distributed.test.cql3;
 
 import accord.utils.Property;
+import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
 public class FullAccordInteropSingleNodeTableWalkTest extends AccordInteropSingleNodeTableWalkBase
@@ -29,9 +30,11 @@ public FullAccordInteropSingleNodeTableWalkTest()
     }
 
     @Override
-    protected void preCheck(Property.StatefulBuilder builder)
+    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;
     }
 }

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

@@ -19,6 +19,7 @@
 package org.apache.cassandra.distributed.test.cql3;
 
 import accord.utils.Property;
+import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
 public class MixedReadsAccordInteropMultiNodeTableWalkTest extends AccordInteropMultiNodeTableWalkBase
@@ -29,9 +30,11 @@ public MixedReadsAccordInteropMultiNodeTableWalkTest()
     }
 
     @Override
-    protected void preCheck(Property.StatefulBuilder builder)
+    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;
     }
 }

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

@@ -19,6 +19,7 @@
 package org.apache.cassandra.distributed.test.cql3;
 
 import accord.utils.Property;
+import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
 public class MixedReadsAccordInteropSingleNodeTableWalkTest extends AccordInteropSingleNodeTableWalkBase
@@ -29,9 +30,11 @@ public MixedReadsAccordInteropSingleNodeTableWalkTest()
     }
 
     @Override
-    protected void preCheck(Property.StatefulBuilder builder)
+    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;
     }
 }

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

@@ -25,10 +25,16 @@
 import accord.utils.RandomSource;
 import org.apache.cassandra.distributed.Cluster;
 import org.apache.cassandra.distributed.api.ConsistencyLevel;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
 import org.apache.cassandra.service.consensus.TransactionalMode;
 
 public class MultiNodeTableWalkTest extends SingleNodeTableWalkTest
 {
+    /**
+     * This field lets the test run as if it was multiple nodes, but actually runs against a single node.
+     * This behavior is desirable when this test fails to see if the issue can be reproduced on single node as well.
+     */
+    private boolean mockMultiNode = true;
 
     public MultiNodeTableWalkTest()
     {
@@ -40,16 +46,21 @@ protected MultiNodeTableWalkTest(@Nullable TransactionalMode transactionalMode)
     }
 
     @Override
-    protected void preCheck(Property.StatefulBuilder builder)
+    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;
+        // Sometimes It's useful to validate that the error is localized to mutliple nodes rather than single node,
+        // so uncomment the below to allow running the test as a single node
+        // mockMultiNode = true;
     }
 
     @Override
     protected Cluster createCluster() throws IOException
     {
-        return createCluster(3, c -> {
+        return createCluster(mockMultiNode ? 1 : 3, c -> {
             c.set("range_request_timeout", "180s")
              .set("read_request_timeout", "180s")
              .set("transaction_timeout", "180s")
@@ -72,6 +83,25 @@ public MultiNodeState(RandomSource rs, Cluster cluster)
             super(rs, cluster);
         }
 
+        @Override
+        protected boolean isMultiNode()
+        {
+            // When a seed fails its useful to rerun the test as a single node to see if the issue persists... but doing so corrupts the random history!
+            // To avoid that, this method hard codes that the test is multi node...
+            return true;
+        }
+
+        @Override
+        protected IInvokableInstance selectInstance(RandomSource rs)
+        {
+            if (mockMultiNode)
+            {
+                rs.nextInt(0, 3); // needed to avoid breaking random history
+                return cluster.get(1);
+            }
+            return super.selectInstance(rs);
+        }
+
         @Override
         protected ConsistencyLevel selectCl()
         {

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

@@ -91,7 +91,7 @@ protected SingleNodeTableWalkTest(@Nullable TransactionalMode transactionalMode)
         this.transactionalMode = transactionalMode;
     }
 
-    protected void preCheck(Property.StatefulBuilder builder)
+    protected void preCheck(Cluster cluster, Property.StatefulBuilder builder)
     {
         // if a failing seed is detected, populate here
         // Example: builder.withSeed(42L);
@@ -111,13 +111,6 @@ protected List<CreateIndexDDL.Indexer> supportedIndexers()
         return Collections.singletonList(CreateIndexDDL.SAI);
     }
 
-    public Property.Command<State, Void, ?> insert(RandomSource rs, State state)
-    {
-        //TODO (maintaince): can this become reusable?  its the same as token conflict test...
-        Mutation mutation = state.mutationGen.next(rs);
-        return state.command(rs, mutation);
-    }
-
     public Property.Command<State, Void, ?> selectExisting(RandomSource rs, State state)
     {
         NavigableSet<BytesPartitionState.Ref> keys = state.model.partitionKeys();
@@ -227,9 +220,9 @@ public void test() throws IOException
         try (Cluster cluster = createCluster())
         {
             Property.StatefulBuilder statefulBuilder = stateful().withExamples(10).withSteps(400);
-            preCheck(statefulBuilder);
+            preCheck(cluster, statefulBuilder);
             statefulBuilder.check(commands(() -> rs -> createState(rs, cluster))
-                                  .add(this::insert)
+                                  .add(StatefulASTBase::insert)
                                   .addIf(State::hasPartitions, this::selectExisting)
                                   .addAllIf(State::supportTokens, b -> b.add(this::selectToken)
                                                                         .add(this::selectTokenRange))
@@ -280,7 +273,7 @@ private static FunctionCall token(State state, BytesPartitionState.Ref ref)
         return FunctionCall.tokenByValue(values);
     }
 
-    public class State extends BaseState
+    public class State extends CommonState
     {
         protected final LinkedHashMap<Symbol, IndexedColumn> indexes;
         private final Gen<Mutation> mutationGen;
@@ -316,6 +309,12 @@ public State(RandomSource rs, Cluster cluster)
                                      .build());
         }
 
+        @Override
+        protected Gen<Mutation> mutationGen()
+        {
+            return mutationGen;
+        }
+
         private LinkedHashMap<Symbol, IndexedColumn> createIndexes(RandomSource rs, TableMetadata metadata)
         {
             LinkedHashMap<Symbol, IndexedColumn> indexed = new LinkedHashMap<>();