wip 3

datastax · May 8, 2024 · 56f937a · 56f937a
1 parent f6ff41f
commit 56f937a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/test-support/src/main/scala/com/datastax/spark/connector/ccm/CcmBridge.scala b/test-support/src/main/scala/com/datastax/spark/connector/ccm/CcmBridge.scala
@@ -50,11 +50,11 @@ class CcmBridge(config: CcmConfig) extends AutoCloseable {
   }
 
   def dsetool(n: Int, args: String*): Unit = {
-    execute(s"node$n dsetool ${args.mkString(" ")}")
+    execute(Seq(s"node$n", "dsetool") ++ args: _*)
   }
 
   def nodetool(n: Int, args: String*): Unit = {
-    execute(s"node$n nodetool ${args.mkString(" < ")}")
+    execute(Seq(s"node$n", "nodetool") ++ args: _*)
   }
 
   def refreshSizeEstimates(n: Int): Unit = {

diff --git a/test-support/src/main/scala/com/datastax/spark/connector/ccm/CcmConfig.scala b/test-support/src/main/scala/com/datastax/spark/connector/ccm/CcmConfig.scala
@@ -19,7 +19,7 @@ case class CcmConfig(
     createOptions: List[String] = List(),
     dseWorkloads: List[String] = List(),
     jmxPortOffset: Int = 0,
-    version: Version = Version.parse(System.getProperty("ccm.version", "5.0-beta1")),
+    version: Version = Version.parse(System.getProperty("ccm.version", "4.1.4")),
     installDirectory: Option[String] = Option(System.getProperty("ccm.directory")),
     installBranch: Option[String] = Option(System.getProperty("ccm.branch")),
     dseEnabled: Boolean = Option(System.getProperty("ccm.dse")).exists(_.toLowerCase == "true"),

diff --git a/test-support/src/main/scala/com/datastax/spark/connector/ccm/mode/StandardModeExecutor.scala b/test-support/src/main/scala/com/datastax/spark/connector/ccm/mode/StandardModeExecutor.scala
@@ -44,8 +44,8 @@ private[mode] trait DefaultExecutor extends ClusterModeExecutor {
 
   override def start(nodeNo: Int): Unit = {
     val jvmArgs = nodeNo match {
-      case 1 => config.jvmArgs :+ "-Dcassandra.superuser_setup_delay_ms=0" :+ "-Dcassandra.ring_delay_ms=1000"
-      case _ => config.jvmArgs :+ "-Dcassandra.ring_delay_ms=5000"
+      case 1 => config.jvmArgs :+ "-Dcassandra.superuser_setup_delay_ms=0" :+ "-Dcassandra.ring_delay_ms=1000" :+ "-Dcassandra.skip_sync=true"
+      case _ => config.jvmArgs :+ "-Dcassandra.ring_delay_ms=5000" :+ "-Dcassandra.skip_sync=true"
     }
     val formattedJvmArgs = jvmArgs.map(arg => s"--jvm_arg=$arg")
     val formattedJvmVersion = javaVersion.map(v => s"--jvm-version=$v").toSeq