Skip to content
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

Jump to bottom

[SPARK-8593] [core] Sort app attempts by start time. #7253

Closed
wants to merge 13 commits into from
Closed

[SPARK-8593] [core] Sort app attempts by start time. #7253

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e3677c9
Merge pull request #1 from apache/master
rekhajoshm May 5, 2015
106fd8e
Merge pull request #2 from apache/master
rekhajoshm May 8, 2015
0be142d
Merge pull request #3 from apache/master
rekhajoshm Jun 22, 2015
ab65fa1
History Server: some attempt completed to work with showIncomplete
rekhajoshm Jul 7, 2015
a41ac4b
History Server: updated order for multiple attempts
rekhajoshm Jul 8, 2015
85024e8
History Server: updated order for multiple attempts
rekhajoshm Jul 8, 2015
304cb0b
History Server: updated order for multiple attempts(reverted HistoryP…
rekhajoshm Jul 8, 2015
cc0fda7
History Server: updated order for multiple attempts(updated test)
rekhajoshm Jul 8, 2015
b0fc922
History Server: updated order for multiple attempts(updated comment)
rekhajoshm Jul 9, 2015
83306a8
History Server: updated order for multiple attempts(descending start …
rekhajoshm Jul 12, 2015
548c753
History Server: updated order for multiple attempts(descending start …
rekhajoshm Jul 13, 2015
716e0b1
History Server: updated order for multiple attempts(descending start …
rekhajoshm Jul 13, 2015
874dd80
History Server: updated order for multiple attempts(logcleaner)
rekhajoshm Jul 14, 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
55 changes: 39 additions & 16 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 @@ -35,7 +35,6 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
Option(request.getParameter("showIncomplete")).getOrElse("false").toBoolean

val allApps = parent.getApplicationList()
.filter(_.attempts.head.completed != requestedIncomplete)
val allAppsSize = allApps.size

val actualFirst = if (requestedFirst < allAppsSize) requestedFirst else 0
Expand All @@ -51,9 +50,15 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
val hasMultipleAttempts = appsToShow.exists(_.attempts.size > 1)
val appTable =
if (hasMultipleAttempts) {
UIUtils.listingTable(appWithAttemptHeader, appWithAttemptRow, appsToShow)
UIUtils.listingTable(
appWithAttemptHeader,
appWithAttemptRow(_, requestedIncomplete),
appsToShow)
} else {
UIUtils.listingTable(appHeader, appRow, appsToShow)
UIUtils.listingTable(
appHeader,
appRow(_, requestedIncomplete),
appsToShow)
}

val providerConfig = parent.getProviderConfig()
Expand Down Expand Up @@ -157,7 +162,8 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
renderAttemptIdColumn: Boolean,
info: ApplicationHistoryInfo,
attempt: ApplicationAttemptInfo,
isFirst: Boolean): Seq[Node] = {
isFirst: Boolean,
requestedIncomplete: Boolean): Seq[Node] = {
val uiAddress = HistoryServer.getAttemptURI(info.id, attempt.attemptId)
val startTime = UIUtils.formatDate(attempt.startTime)
val endTime = if (attempt.endTime > 0) UIUtils.formatDate(attempt.endTime) else "-"
Expand All @@ -168,6 +174,10 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
"-"
}
val lastUpdated = UIUtils.formatDate(attempt.lastUpdated)
var someAttemptCompleted = false
info.attempts.foreach{ attempt =>
Copy link
Member

Choose a reason for hiding this comment

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

I think this can be val someAttemptCompleted = info.attempts.exists(_.completed)

if (attempt.completed) someAttemptCompleted = true
}
<tr>
{
if (isFirst) {
Expand All @@ -185,7 +195,8 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
}
}
{
if (renderAttemptIdColumn) {
if (renderAttemptIdColumn &&
(requestedIncomplete || (!requestedIncomplete && someAttemptCompleted))) {
if (info.attempts.size > 1 && attempt.attemptId.isDefined) {
<td><a href={HistoryServer.getAttemptURI(info.id, attempt.attemptId)}>
{attempt.attemptId.get}</a></td>
Expand All @@ -196,22 +207,34 @@ private[history] class HistoryPage(parent: HistoryServer) extends WebUIPage("")
Nil
}
}
<td sorttable_customkey={attempt.startTime.toString}>{startTime}</td>
<td sorttable_customkey={attempt.endTime.toString}>{endTime}</td>
<td sorttable_customkey={(attempt.endTime - attempt.startTime).toString}>
{duration}</td>
<td>{attempt.sparkUser}</td>
<td sorttable_customkey={attempt.lastUpdated.toString}>{lastUpdated}</td>
{
if (requestedIncomplete || (!requestedIncomplete && someAttemptCompleted)) {
<td sorttable_customkey={attempt.startTime.toString}>{startTime}</td>
<td sorttable_customkey={attempt.endTime.toString}>{endTime}</td>
<td sorttable_customkey={(attempt.endTime - attempt.startTime).toString}>
{duration}</td>
<td>{attempt.sparkUser}</td>
<td sorttable_customkey={attempt.lastUpdated.toString}>{lastUpdated}</td>
} else {
Nil
}
}
</tr>
}

private def appRow(info: ApplicationHistoryInfo): Seq[Node] = {
attemptRow(false, info, info.attempts.head, true)


private def appRow(
info: ApplicationHistoryInfo,
requestedIncomplete: Boolean): Seq[Node] = {
attemptRow(false, info, info.attempts.head, true, requestedIncomplete)
}

private def appWithAttemptRow(info: ApplicationHistoryInfo): Seq[Node] = {
attemptRow(true, info, info.attempts.head, true) ++
info.attempts.drop(1).flatMap(attemptRow(true, info, _, false))
private def appWithAttemptRow(
info: ApplicationHistoryInfo,
requestedIncomplete: Boolean): Seq[Node] = {
attemptRow(true, info, info.attempts.head, true, requestedIncomplete) ++
info.attempts.drop(1).flatMap(attemptRow(true, info, _, false, requestedIncomplete))
}

private def makePageLink(linkPage: Int, showIncomplete: Boolean): String = {
Expand Down