-
Notifications
You must be signed in to change notification settings - Fork 29k
[Spark-20044][Web UI] Support Spark UI behind front-end reverse proxy using a path prefix #17455
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.
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -157,7 +157,9 @@ private[deploy] class ExecutorRunner( | |
| // Add webUI log urls | ||
| val baseUrl = | ||
| if (conf.getBoolean("spark.ui.reverseProxy", false)) { | ||
| s"/proxy/$workerId/logPage/?appId=$appId&executorId=$execId&logType=" | ||
| // TODO get from master? | ||
|
||
| conf.get("spark.ui.reverseProxyUrl", "").stripSuffix("/") + | ||
| s"/proxy/$workerId/logPage/?appId=$appId&executorId=$execId&logType=" | ||
| } else { | ||
| s"http://$publicAddress:$webUiPort/logPage/?appId=$appId&executorId=$execId&logType=" | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This section of code seems like more work than necessary. Can't you just set
masterWebUiUrl = reverseProxyUrlhere and then movereverseProxyUrl.stripSuffix("/")intoSystem.setPropertymaking this a two line function?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we have a front-end reverse proxy path like mydomain.com:80/path/to/spark, then the spark.ui.proxyBase property (prefix for URL generation) must not include a trailing slash, the way it's used in UiUtils, like prependBaseUri("/static/bootstrap.min.css").
However, the explicit URL address pointing to the master UI page (e.g. the back-lilnk from workers to master, which masterWebUiUrl feeds into) must include a trailing slash, if it has a path component, because the master UI page contains relative liks like "app?...".
Without a path component in the master URL (mydomain.com:8080), the trailing slash did not matter for resolving these links, but with a path component, they must resolve to mydomain.com:80/path/to/spark/app (not mydomain.com:80/path/to/app), therefore the base URL must have a trailing slash.
The code is intended to work regardless whether spark.ui.reverseProxyUrl was specified with or without a trailing slash, so the safe way to ensure a single trailing slash was to first strip an optional slash and then add one. Your suggestion would omit the slash if there is none specified in the config.
If there's a clean way to move the stripSuffix handling into the config itself, that would make the code prettier, though