Skip to content

Commit 433da8e

Browse files
committed
SPARKC-621 adjust ccm it test runner to DSE 6.8.5
CCM places metadata directory for DSE 6.8.5 and up in /var/lib/cassandra/metadata. This is invalid as the dir is not accessible.
1 parent 6d3187b commit 433da8e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

test-support/src/main/scala/com/datastax/spark/connector/ccm/CcmConfig.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ object CcmConfig {
116116
val DEFAULT_SERVER_LOCALHOST_KEYSTORE_PATH: String = "/server_localhost.keystore"
117117

118118
// DSE versions
119+
val V6_8_5: Version = Version.parse("6.8.5")
119120
val V6_8_3: Version = Version.parse("6.8.3")
120121
val V6_8_0: Version = Version.parse("6.8.0")
121122
val V6_7_0: Version = Version.parse("6.7.0")

test-support/src/main/scala/com/datastax/spark/connector/ccm/mode/StandardModeExecutor.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ import java.util.concurrent.atomic.AtomicBoolean
66

77
import com.datastax.oss.driver.api.core.Version
88
import com.datastax.spark.connector.ccm.CcmConfig
9+
import com.datastax.spark.connector.ccm.CcmConfig.V6_8_5
910
import org.slf4j.{Logger, LoggerFactory}
1011

11-
import scala.collection.JavaConverters._
12-
1312
private[mode] trait DefaultExecutor extends ClusterModeExecutor {
1413
private val logger: Logger = LoggerFactory.getLogger(classOf[StandardModeExecutor])
1514

@@ -91,6 +90,10 @@ private[mode] trait DefaultExecutor extends ClusterModeExecutor {
9190
s"node$i"
9291

9392
execute(addArgs: _*)
93+
94+
if (config.dseEnabled && config.getDseVersion.exists(_.compareTo(V6_8_5) >= 0)) {
95+
execute("updateconf", s"metadata_directory:${dir.toFile.getAbsolutePath}/metadata$i")
96+
}
9497
}
9598

9699
config.cassandraConfiguration.foreach { case (key, value) =>

0 commit comments

Comments
 (0)