aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorShixiong Zhu <shixiong@databricks.com>2016-02-25 11:39:26 -0800
committerShixiong Zhu <shixiong@databricks.com>2016-02-25 11:39:26 -0800
commit46f6e79316b72afea0c9b1559ea662dd3e95e57b (patch)
tree258bb97b63b3b1811c9188385aa73a4b6bb0accd /core
parent5fcf4c2bfce4b7e3543815c8e49ffdec8072c9a2 (diff)
downloadspark-46f6e79316b72afea0c9b1559ea662dd3e95e57b.tar.gz
spark-46f6e79316b72afea0c9b1559ea662dd3e95e57b.tar.bz2
spark-46f6e79316b72afea0c9b1559ea662dd3e95e57b.zip
Revert "[SPARK-13117][WEB UI] WebUI should use the local ip not 0.0.0.0"
This reverts commit 2e44031fafdb8cf486573b98e4faa6b31ffb90a4.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/ui/WebUI.scala2
-rw-r--r--core/src/test/scala/org/apache/spark/deploy/LogUrlsStandaloneSuite.scala3
2 files changed, 2 insertions, 3 deletions
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 e515916f31..fe4949b9f6 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 =>
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 972b552f7a..f416ace5c2 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)