Skip to content
Closed
Changes from all commits
Commits
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
20 changes: 15 additions & 5 deletions core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,11 @@ private[ui] class StagePage(parent: StagesTab, store: AppStatusStore) extends We

val accumulableHeaders: Seq[String] = Seq("Accumulable", "Value")
def accumulableRow(acc: AccumulableInfo): Seq[Node] = {
<tr><td>{acc.name}</td><td>{acc.value}</td></tr>
if (acc.name != null && acc.value != null) {
<tr><td>{acc.name}</td><td>{acc.value}</td></tr>
} else {
Nil
}
}
val accumulableTable = UIUtils.listingTable(
accumulableHeaders,
Expand Down Expand Up @@ -856,7 +860,7 @@ private[ui] class TaskPagedTable(
{formatBytes(task.taskMetrics.map(_.peakExecutionMemory))}
</td>
{if (hasAccumulators(stage)) {
accumulatorsInfo(task)
<td>{accumulatorsInfo(task)}</td>
}}
{if (hasInput(stage)) {
metricInfo(task) { m =>
Expand Down Expand Up @@ -912,8 +916,12 @@ private[ui] class TaskPagedTable(
}

private def accumulatorsInfo(task: TaskData): Seq[Node] = {
task.accumulatorUpdates.map { acc =>
Unparsed(StringEscapeUtils.escapeHtml4(s"${acc.name}: ${acc.update}"))
task.accumulatorUpdates.flatMap { acc =>
if (acc.name != null && acc.update.isDefined) {
Unparsed(StringEscapeUtils.escapeHtml4(s"${acc.name}: ${acc.update.get}")) ++ <br />
} else {
Nil
}
}
}

Expand Down Expand Up @@ -977,7 +985,9 @@ private object ApiHelper {
"Shuffle Spill (Disk)" -> TaskIndexNames.DISK_SPILL,
"Errors" -> TaskIndexNames.ERROR)

def hasAccumulators(stageData: StageData): Boolean = stageData.accumulatorUpdates.size > 0
def hasAccumulators(stageData: StageData): Boolean = {
stageData.accumulatorUpdates.exists { acc => acc.name != null && acc.value != null }
}

def hasInput(stageData: StageData): Boolean = stageData.inputBytes > 0

Expand Down