Skip to content

[SPARK-11338][WebUI] Prepend app links on HistoryPage with uiRoot path #9291

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
ckadner wants to merge 3 commits into from
Closed

[SPARK-11338][WebUI] Prepend app links on HistoryPage with uiRoot path #9291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bcb3dc
[SPARK-11338][WebUI] Prepend application links on HistoryPage with ui…
ckadner Oct 27, 2015
d054bd7
[SPARK-11338][WebUI] prependBaseUri in method makePageLink
ckadner Oct 29, 2015
01d2f35
[SPARK-11338][WebUI] nit fixes
ckadner Nov 1, 2015
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
9 changes: 4 additions & 5 deletions core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
info: ApplicationHistoryInfo,
attempt: ApplicationAttemptInfo,
isFirst: Boolean): Seq[Node] = {
val uiAddress = HistoryServer.getAttemptURI(info.id, attempt.attemptId)
val uiAddress = UIUtils.prependBaseUri(HistoryServer.getAttemptURI(info.id, attempt.attemptId))
val startTime = UIUtils.formatDate(attempt.startTime)
val endTime = if (attempt.endTime > 0) UIUtils.formatDate(attempt.endTime) else "-"
val duration =
Expand Down Expand Up @@ -190,8 +190,7 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
{
if (renderAttemptIdColumn) {
if (info.attempts.size > 1 && attempt.attemptId.isDefined) {
<td><a href={HistoryServer.getAttemptURI(info.id, attempt.attemptId)}>
{attempt.attemptId.get}</a></td>
<td><a href={uiAddress}>{attempt.attemptId.get}</a></td>
} else {
<td>&nbsp;</td>
}
Expand All @@ -218,9 +217,9 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
}

private def makePageLink(linkPage: Int, showIncomplete: Boolean): String = {
"/?" + Array(
UIUtils.prependBaseUri("/?" + Array(
"page=" + linkPage,
"showIncomplete=" + showIncomplete
).mkString("&")
).mkString("&"))
}
}
21 changes: 19 additions & 2 deletions core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.scalatest.{BeforeAndAfter, Matchers}
import org.scalatest.mock.MockitoSugar

import org.apache.spark.{JsonTestUtils, SecurityManager, SparkConf, SparkFunSuite}
import org.apache.spark.ui.SparkUI
import org.apache.spark.ui.{SparkUI, UIUtils}

/**
* A collection of tests against the historyserver, including comparing responses from the json
Expand Down Expand Up @@ -261,7 +261,24 @@ class HistoryServerSuite extends SparkFunSuite with BeforeAndAfter with Matchers
l <- links
attrs <- l.attribute("href")
} yield (attrs.toString)
justHrefs should contain(link)
justHrefs should contain (UIUtils.prependBaseUri(resource = link))
}

test("relative links are prefixed with uiRoot (spark.ui.proxyBase)") {
val proxyBaseBeforeTest = System.getProperty("spark.ui.proxyBase")
val uiRoot = Option(System.getenv("APPLICATION_WEB_PROXY_BASE")).getOrElse("/testwebproxybase")
val page = new HistoryPage(server)
val request = mock[HttpServletRequest]

// when
System.setProperty("spark.ui.proxyBase", uiRoot)
val response = page.render(request)
System.setProperty("spark.ui.proxyBase", Option(proxyBaseBeforeTest).getOrElse(""))

// then
val urls = response \\ "@href" map (_.toString)
val siteRelativeLinks = urls filter (_.startsWith("/"))
all (siteRelativeLinks) should startWith (uiRoot)
}

def getContentAndCode(path: String, port: Int = port): (Int, Option[String], Option[String]) = {
Expand Down