Skip to content

[SPARK-16988] [Spark Shell] spark history server log needs to be fixed to show https url when ssl is enabled #15611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chie8842 wants to merge 4 commits into from
Closed

[SPARK-16988] [Spark Shell] spark history server log needs to be fixed to show https url when ssl is enabled #15611

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
047151e
fixed weburl outputted by historyserver log
Oct 24, 2016
5d92918
fixed weburl outputted by historyserver log
Oct 25, 2016
6f26e30
fixed weburl outputted by historyserver log
Oct 25, 2016
af73518
fixed spark.ui.ssl to spark.ssl.ui
Oct 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion core/src/main/scala/org/apache/spark/ui/WebUI.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,13 @@ 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 = {
var protocol = "http"
Copy link
Member

@srowen srowen Oct 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

if(conf.get("spark.ssl.enabled") == "true") {
Copy link
Member

@ajbozarth ajbozarth Oct 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its cleaner to use a getOrElse("false") here instead of an == true
Also scalastyle will fail without a space after the if

protocol = "https"
}
s"$protocol://$publicHostName:$boundPort"
Copy link
Member

@srowen srowen Oct 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: don't indent this line further

}

/** Return the actual port to which this server is bound. Only valid after bind(). */
def boundPort: Int = serverInfo.map(_.boundPort).getOrElse(-1)
Expand Down