Skip to content

Commit 204b172

Browse files
authored
Merge pull request #1305 from datastax/SPARKC-642-2.5-test-fix
SPARKC-642 fix TwoNodeCluster integration test setup
2 parents 5ff1ec3 + 3b42d6b commit 204b172

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

connector/src/it/scala/com/datastax/spark/connector/rdd/ReplicaRepartitionedCassandraRDDSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ReplicaRepartitionedCassandraRDDSpec extends SparkCassandraITFlatSpecBase
6464
val someCass = repart.joinWithCassandraTable(ks, tableName)
6565
someCass.partitions.foreach {
6666
case e: EndpointPartition =>
67-
conn.hostAddresses should contain(e.endpoints.head)
67+
conn.hostAddresses.map(_.getHostAddress) should contain(e.endpoints.head)
6868
case _ =>
6969
fail("Unable to get endpoints on repartitioned RDD, This means preferred locations will be broken")
7070
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,20 @@ private[mode] trait DefaultExecutor extends ClusterModeExecutor {
8181
})
8282

8383
config.nodes.foreach { i =>
84+
val node = s"node$i"
8485
val addArgs = Seq ("add",
85-
"-s",
86+
"-s", // every node is a seed node
87+
"-b", // autobootstrap is enabled
8688
"-j", config.jmxPort(i).toString,
8789
"-i", config.ipOfNode(i),
8890
"--remote-debug-port=0") ++
8991
dseFlag :+
90-
s"node$i"
92+
node
9193

9294
execute(addArgs: _*)
9395

9496
if (config.dseEnabled && config.getDseVersion.exists(_.compareTo(V6_8_5) >= 0)) {
95-
execute("updateconf", s"metadata_directory:${dir.toFile.getAbsolutePath}/metadata$i")
97+
execute(node, "updateconf", s"metadata_directory:${dir.toFile.getAbsolutePath}/metadata$i")
9698
}
9799
}
98100

0 commit comments

Comments
 (0)