Repository: spark Updated Branches: refs/heads/master 5fcf4c2bf -> 46f6e7931
Revert "[SPARK-13117][WEB UI] WebUI should use the local ip not 0.0.0.0" This reverts commit 2e44031fafdb8cf486573b98e4faa6b31ffb90a4. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/46f6e793 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/46f6e793 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/46f6e793 Branch: refs/heads/master Commit: 46f6e79316b72afea0c9b1559ea662dd3e95e57b Parents: 5fcf4c2 Author: Shixiong Zhu <shixi...@databricks.com> Authored: Thu Feb 25 11:39:26 2016 -0800 Committer: Shixiong Zhu <shixi...@databricks.com> Committed: Thu Feb 25 11:39:26 2016 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/ui/WebUI.scala | 2 +- .../scala/org/apache/spark/deploy/LogUrlsStandaloneSuite.scala | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/46f6e793/core/src/main/scala/org/apache/spark/ui/WebUI.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/WebUI.scala b/core/src/main/scala/org/apache/spark/ui/WebUI.scala index e515916..fe4949b 100644 --- a/core/src/main/scala/org/apache/spark/ui/WebUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/WebUI.scala @@ -134,7 +134,7 @@ private[spark] abstract class WebUI( def bind() { assert(!serverInfo.isDefined, "Attempted to bind %s more than once!".format(className)) try { - serverInfo = Some(startJettyServer(publicHostName, port, sslOptions, handlers, conf, name)) + serverInfo = Some(startJettyServer("0.0.0.0", port, sslOptions, handlers, conf, name)) logInfo("Started %s at http://%s:%d".format(className, publicHostName, boundPort)) } catch { case e: Exception => http://git-wip-us.apache.org/repos/asf/spark/blob/46f6e793/core/src/test/scala/org/apache/spark/deploy/LogUrlsStandaloneSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/deploy/LogUrlsStandaloneSuite.scala b/core/src/test/scala/org/apache/spark/deploy/LogUrlsStandaloneSuite.scala index 972b552..f416ace 100644 --- a/core/src/test/scala/org/apache/spark/deploy/LogUrlsStandaloneSuite.scala +++ b/core/src/test/scala/org/apache/spark/deploy/LogUrlsStandaloneSuite.scala @@ -26,7 +26,6 @@ import org.apache.spark.{LocalSparkContext, SparkConf, SparkContext, SparkFunSui import org.apache.spark.scheduler.{SparkListener, SparkListenerExecutorAdded} import org.apache.spark.scheduler.cluster.ExecutorInfo import org.apache.spark.util.SparkConfWithEnv -import org.apache.spark.util.Utils class LogUrlsStandaloneSuite extends SparkFunSuite with LocalSparkContext { @@ -54,7 +53,7 @@ class LogUrlsStandaloneSuite extends SparkFunSuite with LocalSparkContext { } test("verify that log urls reflect SPARK_PUBLIC_DNS (SPARK-6175)") { - val SPARK_PUBLIC_DNS = Utils.localHostNameForURI() + val SPARK_PUBLIC_DNS = "public_dns" val conf = new SparkConfWithEnv(Map("SPARK_PUBLIC_DNS" -> SPARK_PUBLIC_DNS)).set( "spark.extraListeners", classOf[SaveExecutorInfo].getName) sc = new SparkContext("local-cluster[2,1,1024]", "test", conf) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
