[SPARK-16808][Core] prepend base URI for links on main history server #15739
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vijoshi
reviewed
Nov 2, 2016
| @@ -296,7 +296,7 @@ object HistoryServer extends Logging { | |||
|
|
|||
| private[history] def getAttemptURI(appId: String, attemptId: Option[String]): String = { | |||
| val attemptSuffix = attemptId.map { id => s"/$id" }.getOrElse("") | |||
| s"${HistoryServer.UI_PATH_PREFIX}/${appId}${attemptSuffix}" | |||
| UIUtils.prependBaseUri(s"${HistoryServer.UI_PATH_PREFIX}/${appId}${attemptSuffix}") | |||
There was a problem hiding this comment.
I believe the application links rendered through the historypage-template.html would not pick up the attempt URI from this API, so those would remain broken. Also, looks like this would cause jetty to now register the UI handler for this app on the /<proxy-base>/<HistoryServer.UI_PATH_PREFIX>/ context path, which may not be what we want ?
|
ok to test @vanzin |
|
Also there's another patch trying to solve the same issue: #15742 |
|
Test build #68079 has finished for PR 15739 at commit
|
|
The other patch includes a testcase. Let's go with that one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Make the 2.0.x Spark UI links work on systems with proxy servers by prepending the spark.ui.proxyBase or APPLICATION_WEB_PROXY_BASE to links on the first page. This is a regression from 1.6.x (although that was fixed at the caller).
Fixing it in the getAttemptURI places the entire URI generation in one place like done for other URI's in history making future regressions less likely.
How was this patch tested?
Tested manually and dev/run-tests
@andrewor14
the contribution is original work and I license the work to the project under the project's open source license