From 451801007496cd853d0053285a0757e31015a12a Mon Sep 17 00:00:00 2001 From: sarutak Date: Wed, 7 Dec 2016 16:14:15 +0900 Subject: [PATCH 1/2] Reverted the change in SPARK-16988 --- core/src/main/scala/org/apache/spark/ui/WebUI.scala | 5 +---- 1 file changed, 1 insertion(+), 4 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 8c801558672fa..b8604c52e6b0b 100644 --- a/core/src/main/scala/org/apache/spark/ui/WebUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/WebUI.scala @@ -147,10 +147,7 @@ private[spark] abstract class WebUI( } /** Return the url of web interface. Only valid after bind(). */ - def webUrl: String = { - val protocol = if (sslOptions.enabled) "https" else "http" - s"$protocol://$publicHostName:$boundPort" - } + def webUrl: String = s"http://$publicHostName:$boundPort" /** Return the actual port to which this server is bound. Only valid after bind(). */ def boundPort: Int = serverInfo.map(_.boundPort).getOrElse(-1) From 66e0edfe839920cc9a2e6ecbca91a889a1c22619 Mon Sep 17 00:00:00 2001 From: sarutak Date: Wed, 7 Dec 2016 17:43:48 +0900 Subject: [PATCH 2/2] Fix the link from MasterPage to WorkerPage --- .../src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala index 8b1c6bf2e5fd5..0940f3c55844c 100755 --- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala @@ -187,8 +187,7 @@ private[deploy] class Worker( webUi = new WorkerWebUI(this, workDir, webUiPort) webUi.bind() - val scheme = if (webUi.sslOptions.enabled) "https" else "http" - workerWebUiUrl = s"$scheme://$publicAddress:${webUi.boundPort}" + workerWebUiUrl = s"http://$publicAddress:${webUi.boundPort}" registerWithMaster() metricsSystem.registerSource(workerSource)