aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-03-26 18:22:15 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-03-26 18:22:15 -0700
commitbe6d96c15b3c31cd27bdd79fb259072479151ae6 (patch)
tree13ff1188813957c0ef712cd8b3e43dc5bdf5a726
parente15e57413e07e5d4787514702f735bba0c30cae5 (diff)
downloadspark-be6d96c15b3c31cd27bdd79fb259072479151ae6.tar.gz
spark-be6d96c15b3c31cd27bdd79fb259072479151ae6.tar.bz2
spark-be6d96c15b3c31cd27bdd79fb259072479151ae6.zip
SPARK-1324: SparkUI Should Not Bind to SPARK_PUBLIC_DNS
/cc @aarondav and @andrewor14 Author: Patrick Wendell <pwendell@gmail.com> Closes #231 from pwendell/ui-binding and squashes the following commits: e8025f8 [Patrick Wendell] SPARK-1324: SparkUI Should Not Bind to SPARK_PUBLIC_DNS
-rw-r--r--core/src/main/scala/org/apache/spark/ui/SparkUI.scala9
1 files changed, 5 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
index fd638c83aa..ef1ad872c8 100644
--- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
+++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
@@ -47,7 +47,8 @@ private[spark] class SparkUI(
val securityManager = if (live) sc.env.securityManager else new SecurityManager(conf)
- private val host = Option(System.getenv("SPARK_PUBLIC_DNS")).getOrElse(Utils.localHostName())
+ private val bindHost = Utils.localHostName()
+ private val publicHost = Option(System.getenv("SPARK_PUBLIC_DNS")).getOrElse(bindHost)
private val port = conf.get("spark.ui.port", SparkUI.DEFAULT_PORT).toInt
private var serverInfo: Option[ServerInfo] = None
@@ -79,8 +80,8 @@ private[spark] class SparkUI(
/** Bind the HTTP server which backs this web interface */
def bind() {
try {
- serverInfo = Some(startJettyServer(host, port, handlers, sc.conf))
- logInfo("Started Spark Web UI at http://%s:%d".format(host, boundPort))
+ serverInfo = Some(startJettyServer(bindHost, port, handlers, sc.conf))
+ logInfo("Started Spark Web UI at http://%s:%d".format(publicHost, boundPort))
} catch {
case e: Exception =>
logError("Failed to create Spark JettyUtils", e)
@@ -111,7 +112,7 @@ private[spark] class SparkUI(
logInfo("Stopped Spark Web UI at %s".format(appUIAddress))
}
- private[spark] def appUIAddress = "http://" + host + ":" + boundPort
+ private[spark] def appUIAddress = "http://" + publicHost + ":" + boundPort
}