[SPARK-16988] [Spark Shell] spark history server log needs to be fixed to show https url when ssl is enabled #15611
Conversation
| def webUrl: String = s"http://$publicHostName:$boundPort" | ||
| def webUrl: String = { | ||
| var protocol = "http" | ||
| if(conf.get("spark.ssl.enabled") == "true") { |
There was a problem hiding this comment.
Its cleaner to use a getOrElse("false") here instead of an == true
Also scalastyle will fail without a space after the if
| /** Return the url of web interface. Only valid after bind(). */ | ||
| def webUrl: String = s"http://$publicHostName:$boundPort" | ||
| def webUrl: String = { | ||
| var protocol = "http" |
There was a problem hiding this comment.
val protocol = if (conf.getBoolean("spark.ssl.enabled", false)) "https" else "http"
There is actually spark.ssl.ui.enabled too, to specifically control the UI. I suppose really you need to check whether sslOptions.enabled is true.
|
Thank you for your comments. I’ll fix my program |
|
Hey @hayashidac , you did't need to close this PR. You should have just pushed your change... |
|
I applied comments. Please check again. |
| def webUrl: String = s"http://$publicHostName:$boundPort" | ||
| def webUrl: String = { | ||
| val protocol = if (sslOptions.enabled) "https" else "http" | ||
| s"$protocol://$publicHostName:$boundPort" |
There was a problem hiding this comment.
Nit: don't indent this line further
|
sorry, I fixed it. |
|
Jenkins, test this please. |
|
I noticed that all of |
|
Looking good, thank you. I also wouldn't mind fixing the "spark.ui.ssl" -> "spark.ssl.ui" issue here because it's a little bit related. |
|
I fixed SSLOptionsSuite.scala too. |
|
Test build #67505 has finished for PR 15611 at commit
|
|
ok to test. |
|
Test build #67513 has finished for PR 15611 at commit
|
|
LGTM. Merging into |
… 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 <[email protected]> Closes #15611 from hayashidac/SPARK-16988. (cherry picked from commit c329a56) Signed-off-by: Kousuke Saruta <[email protected]>
… 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 <[email protected]> Closes apache#15611 from hayashidac/SPARK-16988.
… 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 <[email protected]> Closes apache#15611 from hayashidac/SPARK-16988.
5 participants
spark history server log needs to be fixed to show https url when ssl is enabled