From afc07ee14974a38c3b6912dfd2943084d25eeccf Mon Sep 17 00:00:00 2001 From: Hideaki Tanaka Date: Fri, 4 Aug 2017 08:57:14 -0700 Subject: [PATCH] [SPARK-21642][CORE] Use FQDN for DRIVER_HOST_ADDRESS instead of ip address --- .../scala/org/apache/spark/internal/config/package.scala | 2 +- core/src/main/scala/org/apache/spark/util/Utils.scala | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/internal/config/package.scala b/core/src/main/scala/org/apache/spark/internal/config/package.scala index ef28e2c48ad02..9495cd2835f97 100644 --- a/core/src/main/scala/org/apache/spark/internal/config/package.scala +++ b/core/src/main/scala/org/apache/spark/internal/config/package.scala @@ -222,7 +222,7 @@ package object config { private[spark] val DRIVER_HOST_ADDRESS = ConfigBuilder("spark.driver.host") .doc("Address of driver endpoints.") .stringConf - .createWithDefault(Utils.localHostName()) + .createWithDefault(Utils.localCanonicalHostName()) private[spark] val DRIVER_BIND_ADDRESS = ConfigBuilder("spark.driver.bindAddress") .doc("Address where to bind network listen sockets on the driver.") diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala index d661293e529f9..900a619421903 100644 --- a/core/src/main/scala/org/apache/spark/util/Utils.scala +++ b/core/src/main/scala/org/apache/spark/util/Utils.scala @@ -936,6 +936,13 @@ private[spark] object Utils extends Logging { customHostname = Some(hostname) } + /** + * Get the local machine's FQDN. + */ + def localCanonicalHostName(): String = { + customHostname.getOrElse(localIpAddress.getCanonicalHostName) + } + /** * Get the local machine's hostname. */