From c329a568b58d65c492a43926bf0f588f2ae6a66e Mon Sep 17 00:00:00 2001
From: hayashidac <hayashidac@nttdata.co.jp>
Date: Wed, 26 Oct 2016 07:13:48 +0900
Subject: [PATCH] [SPARK-16988][SPARK SHELL] spark history server log needs to
be fixed to show https url when ssl is enabled
spark history server log needs to be fixed to show https url when ssl is enabled
Author: chie8842 <chie@chie-no-Mac-mini.local>
Closes #15611 from hayashidac/SPARK-16988.
---
core/src/main/scala/org/apache/spark/ui/WebUI.scala | 5 ++++-
.../test/scala/org/apache/spark/SSLOptionsSuite.scala | 10 +++++-----
2 files changed, 9 insertions(+), 6 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 4118fcf46b..a05e0efb7a 100644
--- a/core/src/main/scala/org/apache/spark/ui/WebUI.scala
+++ b/core/src/main/scala/org/apache/spark/ui/WebUI.scala
@@ -147,7 +147,10 @@ private[spark] abstract class WebUI(
}
/** Return the url of web interface. Only valid after bind(). */
- def webUrl: String = s"http://$publicHostName:$boundPort"
+ def webUrl: String = {
+ val protocol = if (sslOptions.enabled) "https" else "http"
+ s"$protocol://$publicHostName:$boundPort"
+ }
/** Return the actual port to which this server is bound. Only valid after bind(). */
def boundPort: Int = serverInfo.map(_.boundPort).getOrElse(-1)
diff --git a/core/src/test/scala/org/apache/spark/SSLOptionsSuite.scala b/core/src/test/scala/org/apache/spark/SSLOptionsSuite.scala
index 159b448e05..2b8b1805bc 100644
--- a/core/src/test/scala/org/apache/spark/SSLOptionsSuite.scala
+++ b/core/src/test/scala/org/apache/spark/SSLOptionsSuite.scala
@@ -79,7 +79,7 @@ class SSLOptionsSuite extends SparkFunSuite with BeforeAndAfterAll {
conf.set("spark.ssl.protocol", "SSLv3")
val defaultOpts = SSLOptions.parse(conf, "spark.ssl", defaults = None)
- val opts = SSLOptions.parse(conf, "spark.ui.ssl", defaults = Some(defaultOpts))
+ val opts = SSLOptions.parse(conf, "spark.ssl.ui", defaults = Some(defaultOpts))
assert(opts.enabled === true)
assert(opts.trustStore.isDefined === true)
@@ -102,20 +102,20 @@ class SSLOptionsSuite extends SparkFunSuite with BeforeAndAfterAll {
val conf = new SparkConf
conf.set("spark.ssl.enabled", "true")
- conf.set("spark.ui.ssl.enabled", "false")
+ conf.set("spark.ssl.ui.enabled", "false")
conf.set("spark.ssl.keyStore", keyStorePath)
conf.set("spark.ssl.keyStorePassword", "password")
- conf.set("spark.ui.ssl.keyStorePassword", "12345")
+ conf.set("spark.ssl.ui.keyStorePassword", "12345")
conf.set("spark.ssl.keyPassword", "password")
conf.set("spark.ssl.trustStore", trustStorePath)
conf.set("spark.ssl.trustStorePassword", "password")
conf.set("spark.ssl.enabledAlgorithms",
"TLS_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA")
- conf.set("spark.ui.ssl.enabledAlgorithms", "ABC, DEF")
+ conf.set("spark.ssl.ui.enabledAlgorithms", "ABC, DEF")
conf.set("spark.ssl.protocol", "SSLv3")
val defaultOpts = SSLOptions.parse(conf, "spark.ssl", defaults = None)
- val opts = SSLOptions.parse(conf, "spark.ui.ssl", defaults = Some(defaultOpts))
+ val opts = SSLOptions.parse(conf, "spark.ssl.ui", defaults = Some(defaultOpts))
assert(opts.enabled === false)
assert(opts.trustStore.isDefined === true)
--
GitLab