You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2016/12/07 19:41:40 UTC
spark git commit: [SPARK-18762][WEBUI] Web UI should be http:4040
instead of https:4040
Repository: spark
Updated Branches:
refs/heads/master dbf3e298a -> bb94f61a7
[SPARK-18762][WEBUI] Web UI should be http:4040 instead of https:4040
## What changes were proposed in this pull request?
When SSL is enabled, the Spark shell shows:
```
Spark context Web UI available at https://192.168.99.1:4040
```
This is wrong because 4040 is http, not https. It redirects to the https port.
More importantly, this introduces several broken links in the UI. For example, in the master UI, the worker link is https:8081 instead of http:8081 or https:8481.
CC: mengxr liancheng
I manually tested accessing by accessing MasterPage, WorkerPage and HistoryServer with SSL enabled.
Author: sarutak <sa...@oss.nttdata.co.jp>
Closes #16190 from sarutak/SPARK-18761.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bb94f61a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bb94f61a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bb94f61a
Branch: refs/heads/master
Commit: bb94f61a7ac97bf904ec0e8d5a4ab69a4142443f
Parents: dbf3e29
Author: sarutak <sa...@oss.nttdata.co.jp>
Authored: Wed Dec 7 11:41:23 2016 -0800
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Wed Dec 7 11:41:23 2016 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 3 +--
core/src/main/scala/org/apache/spark/ui/WebUI.scala | 5 +----
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/bb94f61a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
----------------------------------------------------------------------
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 8b1c6bf..0940f3c 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)
http://git-wip-us.apache.org/repos/asf/spark/blob/bb94f61a/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 8c80155..b8604c5 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org