Switch tests to Cassandra 4.0 by default (#1566)

* Switch CCM to Cassandra 4.0 by default
* Add a few startup tweaks for C* 3+ and 4+

Author: adutra

integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementIT.java

@@ -279,7 +279,9 @@ public void should_fail_to_reprepare_if_query_becomes_invalid() {
     Throwable t = catchThrowable(() -> session.execute(ps.bind()));
 
     // Then
-    assertThat(t).isInstanceOf(InvalidQueryException.class).hasMessage("Undefined column name d");
+    assertThat(t)
+        .isInstanceOf(InvalidQueryException.class)
+        .hasMessageContaining("Undefined column name d");
   }
 
   @Test

integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/SchemaIT.java

@@ -226,7 +226,8 @@ public void should_get_virtual_metadata() {
       assertThat(tm).isNotNull();
       assertThat(tm.getName().toString()).isEqualTo("sstable_tasks");
       assertThat(tm.isVirtual()).isTrue();
-      assertThat(tm.getColumns().size()).isEqualTo(7);
+      // DSE 6.8+ reports 7 columns, Cassandra 4+ reports 8 columns
+      assertThat(tm.getColumns().size()).isGreaterThanOrEqualTo(7);
       assertThat(tm.getIndexes().size()).isEqualTo(0);
       assertThat(tm.getPartitionKey().size()).isEqualTo(1);
       assertThat(tm.getPartitionKey().get(0).getName().toString()).isEqualTo("keyspace_name");
@@ -235,11 +236,24 @@ public void should_get_virtual_metadata() {
       assertThat(tm.getOptions().size()).isEqualTo(0);
       assertThat(tm.getKeyspace()).isEqualTo(kmd.getName());
       assertThat(tm.describe(true))
-          .isEqualTo(
+          .isIn(
+              // DSE 6.8+
+              "/* VIRTUAL TABLE system_views.sstable_tasks (\n"
+                  + "    keyspace_name text,\n"
+                  + "    table_name text,\n"
+                  + "    task_id uuid,\n"
+                  + "    kind text,\n"
+                  + "    progress bigint,\n"
+                  + "    total bigint,\n"
+                  + "    unit text,\n"
+                  + "    PRIMARY KEY (keyspace_name, table_name, task_id)\n"
+                  + "); */",
+              // Cassandra 4.0
               "/* VIRTUAL TABLE system_views.sstable_tasks (\n"
                   + "    keyspace_name text,\n"
                   + "    table_name text,\n"
                   + "    task_id uuid,\n"
+                  + "    completion_ratio double,\n"
                   + "    kind text,\n"
                   + "    progress bigint,\n"
                   + "    total bigint,\n"

integration-tests/src/test/resources/logback-test.xml

@@ -29,7 +29,7 @@
   <logger name="com.datastax.oss.driver" level="${ossDriverLevel:-ERROR}"/>
   <logger name="com.datastax.dse.driver" level="${dseDriverLevel:-ERROR}"/>
   <logger name="com.datastax.oss.simulacron" level="${simulacronLevel:-ERROR}"/>
-  <logger name="com.datastax.oss.driver.api.testinfra.ccm" level="${ccmLevel:-ERROR}"/>
+  <logger name="com.datastax.oss.driver.api.testinfra.ccm" level="${ccmLevel:-INFO}"/>
   <!-- Set this logger to DEBUG to help debugging OSGi tests -->
   <logger name="org.ops4j" level="${osgiLevel:-ERROR}"/>
 </configuration>

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CcmBridge.java

@@ -49,28 +49,10 @@
 
 public class CcmBridge implements AutoCloseable {
 
-  private static final Logger logger = LoggerFactory.getLogger(CcmBridge.class);
-
-  private final int[] nodes;
-
-  private final Path configDirectory;
-
-  private final AtomicBoolean started = new AtomicBoolean();
-
-  private final AtomicBoolean created = new AtomicBoolean();
-
-  private final String ipPrefix;
-
-  private final Map<String, Object> cassandraConfiguration;
-  private final Map<String, Object> dseConfiguration;
-  private final List<String> rawDseYaml;
-  private final List<String> createOptions;
-  private final List<String> dseWorkloads;
-
-  private final String jvmArgs;
+  private static final Logger LOG = LoggerFactory.getLogger(CcmBridge.class);
 
   public static final Version VERSION =
-      Objects.requireNonNull(Version.parse(System.getProperty("ccm.version", "3.11.0")));
+      Objects.requireNonNull(Version.parse(System.getProperty("ccm.version", "4.0.0")));
 
   public static final String INSTALL_DIRECTORY = System.getProperty("ccm.directory");
 
@@ -126,6 +108,26 @@ public class CcmBridge implements AutoCloseable {
   private static final Version V3_0_15 = Version.parse("3.0.15");
   private static final Version V2_1_19 = Version.parse("2.1.19");
 
+  static {
+    if (DSE_ENABLEMENT) {
+      LOG.info("CCM Bridge configured with DSE version {}", VERSION);
+    } else {
+      LOG.info("CCM Bridge configured with Apache Cassandra version {}", VERSION);
+    }
+  }
+
+  private final int[] nodes;
+  private final Path configDirectory;
+  private final AtomicBoolean started = new AtomicBoolean();
+  private final AtomicBoolean created = new AtomicBoolean();
+  private final String ipPrefix;
+  private final Map<String, Object> cassandraConfiguration;
+  private final Map<String, Object> dseConfiguration;
+  private final List<String> rawDseYaml;
+  private final List<String> createOptions;
+  private final List<String> dseWorkloads;
+  private final String jvmArgs;
+
   private CcmBridge(
       Path configDirectory,
       int[] nodes,
@@ -141,10 +143,7 @@ private CcmBridge(
       // Hack to ensure that the default DC is always called 'dc1': pass a list ('-nX:0') even if
       // there is only one DC (with '-nX', CCM configures `SimpleSnitch`, which hard-codes the name
       // to 'datacenter1')
-      int[] tmp = new int[2];
-      tmp[0] = nodes[0];
-      tmp[1] = 0;
-      this.nodes = tmp;
+      this.nodes = new int[] {nodes[0], 0};
     } else {
       this.nodes = nodes;
     }
@@ -351,27 +350,27 @@ private void executeCheckLogError() {
 
   private void execute(CommandLine cli, boolean forceErrorLogging) {
     if (forceErrorLogging) {
-      logger.error("Executing: " + cli);
+      LOG.error("Executing: " + cli);
     } else {
-      logger.debug("Executing: " + cli);
+      LOG.debug("Executing: " + cli);
     }
     ExecuteWatchdog watchDog = new ExecuteWatchdog(TimeUnit.MINUTES.toMillis(10));
     try (LogOutputStream outStream =
             new LogOutputStream() {
               @Override
               protected void processLine(String line, int logLevel) {
                 if (forceErrorLogging) {
-                  logger.error("ccmout> {}", line);
+                  LOG.error("ccmout> {}", line);
                 } else {
-                  logger.debug("ccmout> {}", line);
+                  LOG.debug("ccmout> {}", line);
                 }
               }
             };
         LogOutputStream errStream =
             new LogOutputStream() {
               @Override
               protected void processLine(String line, int logLevel) {
-                logger.error("ccmerr> {}", line);
+                LOG.error("ccmerr> {}", line);
               }
             }) {
       Executor executor = new DefaultExecutor();
@@ -381,8 +380,7 @@ protected void processLine(String line, int logLevel) {
 
       int retValue = executor.execute(cli);
       if (retValue != 0) {
-        logger.error(
-            "Non-zero exit code ({}) returned from executing ccm command: {}", retValue, cli);
+        LOG.error("Non-zero exit code ({}) returned from executing ccm command: {}", retValue, cli);
       }
     } catch (IOException ex) {
       if (watchDog.killedProcess()) {
@@ -413,7 +411,7 @@ private static File createTempStore(String storePath) {
       f.deleteOnExit();
       Resources.copy(CcmBridge.class.getResource(storePath), os);
     } catch (IOException e) {
-      logger.warn("Failure to write keystore, SSL-enabled servers may fail to start.", e);
+      LOG.warn("Failure to write keystore, SSL-enabled servers may fail to start.", e);
     }
     return f;
   }

test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/DefaultCcmBridgeBuilderCustomizer.java

@@ -17,6 +17,8 @@
 
 import com.datastax.oss.driver.api.core.Version;
 
+/** @see CcmRule */
+@SuppressWarnings("unused")
 public class DefaultCcmBridgeBuilderCustomizer {
 
   public static CcmBridge.Builder configureBuilder(CcmBridge.Builder builder) {
@@ -25,6 +27,12 @@ public static CcmBridge.Builder configureBuilder(CcmBridge.Builder builder) {
       builder.withCassandraConfiguration("enable_materialized_views", true);
       builder.withCassandraConfiguration("enable_sasi_indexes", true);
     }
+    if (CcmBridge.VERSION.nextStable().compareTo(Version.V3_0_0) >= 0) {
+      builder.withJvmArgs("-Dcassandra.superuser_setup_delay_ms=0");
+      builder.withJvmArgs("-Dcassandra.skip_wait_for_gossip_to_settle=0");
+      builder.withCassandraConfiguration("num_tokens", "1");
+      builder.withCassandraConfiguration("initial_token", "0");
+    }
     return builder;
   }
 }