Skip to content

[SPARK-39468][CORE] Improve RpcAddress to add [] to IPv6 if needed #36868

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
dongjoon-hyun wants to merge 2 commits into from
Closed

[SPARK-39468][CORE] Improve RpcAddress to add [] to IPv6 if needed #36868

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8793ef6
[SPARK-39468][CORE] Support `IPv6` in `RpcAddress`
dongjoon-hyun Jun 14, 2022
ed10d51
def -> val
dongjoon-hyun Jun 14, 2022
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
4 changes: 3 additions & 1 deletion core/src/main/scala/org/apache/spark/rpc/RpcAddress.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ import org.apache.spark.util.Utils
/**
* Address for an RPC environment, with hostname and port.
*/
private[spark] case class RpcAddress(host: String, port: Int) {
private[spark] case class RpcAddress(_host: String, port: Int) {

def host: String = Utils.addBracketsIfNeeded(_host)

def hostPort: String = host + ":" + port

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ private[spark] object Utils extends Logging {
addBracketsIfNeeded(customHostname.getOrElse(InetAddresses.toUriString(localIpAddress)))
}

private def addBracketsIfNeeded(addr: String): String = {
private[spark] def addBracketsIfNeeded(addr: String): String = {
if (addr.contains(":") && !addr.contains("[")) {
"[" + addr + "]"
} else {
Expand Down
18 changes: 18 additions & 0 deletions core/src/test/scala/org/apache/spark/rpc/RpcAddressSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,22 @@ class RpcAddressSuite extends SparkFunSuite {
val address = RpcAddress("1.2.3.4", 1234)
assert(address.toSparkURL == "spark://1.2.3.4:1234")
}

test("SPARK-39468: IPv6 hostPort") {
val address = RpcAddress("::1", 1234)
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the main use case of this PR.

assert(address.host == "[::1]")
assert(address.port == 1234)
assert(address.hostPort == "[::1]:1234")
}

test("SPARK-39468: IPv6 fromSparkURL") {
val address = RpcAddress.fromSparkURL("spark://[::1]:1234")
assert(address.host == "[::1]")
assert(address.port == 1234)
}

test("SPARK-39468: IPv6 toSparkURL") {
val address = RpcAddress("::1", 1234)
assert(address.toSparkURL == "spark://[::1]:1234")
}
}