Skip to content

[SPARK-11831][Core][Tests]Use port 0 to avoid port conflicts in tests (backport to branch 1.5) #9850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-11831][Core][Tests]Use port 0 to avoid port conflicts in tests (backport to branch 1.5) #9850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {

override def beforeAll(): Unit = {
val conf = new SparkConf()
env = createRpcEnv(conf, "local", 12345)
env = createRpcEnv(conf, "local", 0)
}

override def afterAll(): Unit = {
Expand Down Expand Up @@ -75,7 +75,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
}
})

val anotherEnv = createRpcEnv(new SparkConf(), "remote", 13345)
val anotherEnv = createRpcEnv(new SparkConf(), "remote", 0)
// Use anotherEnv to find out the RpcEndpointRef
val rpcEndpointRef = anotherEnv.setupEndpointRef("local", env.address, "send-remotely")
try {
Expand Down Expand Up @@ -130,7 +130,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
}
})

val anotherEnv = createRpcEnv(new SparkConf(), "remote", 13345)
val anotherEnv = createRpcEnv(new SparkConf(), "remote", 0)
// Use anotherEnv to find out the RpcEndpointRef
val rpcEndpointRef = anotherEnv.setupEndpointRef("local", env.address, "ask-remotely")
try {
Expand Down Expand Up @@ -158,7 +158,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
val shortProp = "spark.rpc.short.timeout"
conf.set("spark.rpc.retry.wait", "0")
conf.set("spark.rpc.numRetries", "1")
val anotherEnv = createRpcEnv(conf, "remote", 13345)
val anotherEnv = createRpcEnv(conf, "remote", 0)
// Use anotherEnv to find out the RpcEndpointRef
val rpcEndpointRef = anotherEnv.setupEndpointRef("local", env.address, "ask-timeout")
try {
Expand Down Expand Up @@ -420,7 +420,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
}
})

val anotherEnv = createRpcEnv(new SparkConf(), "remote", 13345)
val anotherEnv = createRpcEnv(new SparkConf(), "remote", 0)
// Use anotherEnv to find out the RpcEndpointRef
val rpcEndpointRef = anotherEnv.setupEndpointRef("local", env.address, "sendWithReply-remotely")
try {
Expand Down Expand Up @@ -460,7 +460,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
}
})

val anotherEnv = createRpcEnv(new SparkConf(), "remote", 13345)
val anotherEnv = createRpcEnv(new SparkConf(), "remote", 0)
// Use anotherEnv to find out the RpcEndpointRef
val rpcEndpointRef = anotherEnv.setupEndpointRef(
"local", env.address, "sendWithReply-remotely-error")
Expand Down Expand Up @@ -500,7 +500,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {

})

val anotherEnv = createRpcEnv(new SparkConf(), "remote", 13345)
val anotherEnv = createRpcEnv(new SparkConf(), "remote", 0)
// Use anotherEnv to find out the RpcEndpointRef
val rpcEndpointRef = anotherEnv.setupEndpointRef(
"local", env.address, "network-events")
Expand Down Expand Up @@ -529,7 +529,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
}
})

val anotherEnv = createRpcEnv(new SparkConf(), "remote", 13345)
val anotherEnv = createRpcEnv(new SparkConf(), "remote", 0)
// Use anotherEnv to find out the RpcEndpointRef
val rpcEndpointRef = anotherEnv.setupEndpointRef(
"local", env.address, "sendWithReply-unserializable-error")
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/scala/org/apache/spark/rpc/akka/AkkaRpcEnvSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class AkkaRpcEnvSuite extends RpcEnvSuite {
})
val conf = new SparkConf()
val newRpcEnv = new AkkaRpcEnvFactory().create(
RpcEnvConfig(conf, "test", "localhost", 12346, new SecurityManager(conf)))
RpcEnvConfig(conf, "test", "localhost", 0, new SecurityManager(conf)))
try {
val newRef = newRpcEnv.setupEndpointRef("local", ref.address, "test_endpoint")
assert(s"akka.tcp://local@${env.address}/user/test_endpoint" ===
Expand All @@ -56,7 +56,7 @@ class AkkaRpcEnvSuite extends RpcEnvSuite {
val conf = SSLSampleConfigs.sparkSSLConfig()
val securityManager = new SecurityManager(conf)
val rpcEnv = new AkkaRpcEnvFactory().create(
RpcEnvConfig(conf, "test", "localhost", 12346, securityManager))
RpcEnvConfig(conf, "test", "localhost", 0, securityManager))
try {
val uri = rpcEnv.uriOf("local", RpcAddress("1.2.3.4", 12345), "test_endpoint")
assert("akka.ssl.tcp://local@1.2.3.4:12345/user/test_endpoint" === uri)
Expand Down