Skip to content

[SPARK-39459][CORE] local*HostName* methods should support IPv6 #36863

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 3 commits into from
Closed

[SPARK-39459][CORE] local*HostName* methods should support IPv6 #36863

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da9136b
[SPARK-39459][CORE] localHostName* methods should support IPv6
dongjoon-hyun Jun 14, 2022
689f6df
Add more for ExternalSorterSuite
dongjoon-hyun Jun 14, 2022
401cb6e
Empty commit
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
15 changes: 12 additions & 3 deletions 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 @@ -1071,21 +1071,30 @@ private[spark] object Utils extends Logging {
* Get the local machine's FQDN.
*/
def localCanonicalHostName(): String = {
customHostname.getOrElse(localIpAddress.getCanonicalHostName)
addBracketsIfNeeded(customHostname.getOrElse(localIpAddress.getCanonicalHostName))
}

/**
* Get the local machine's hostname.
* In case of IPv6, getHostAddress may return '0:0:0:0:0:0:0:1'.
*/
def localHostName(): String = {
customHostname.getOrElse(localIpAddress.getHostAddress)
addBracketsIfNeeded(customHostname.getOrElse(localIpAddress.getHostAddress))
}

/**
* Get the local machine's URI.
*/
def localHostNameForURI(): String = {
customHostname.getOrElse(InetAddresses.toUriString(localIpAddress))
addBracketsIfNeeded(customHostname.getOrElse(InetAddresses.toUriString(localIpAddress)))
}

private def addBracketsIfNeeded(addr: String): String = {
if (addr.contains(":") && !addr.contains("[")) {
"[" + addr + "]"
} else {
addr
}
}

/**
Expand Down