You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2015/05/12 23:41:25 UTC
spark git commit: [SPARK-7406] [STREAMING] [WEBUI] Add tooltips for
"Scheduling Delay", "Processing Time" and "Total Delay"
Repository: spark
Updated Branches:
refs/heads/master a4874b0d1 -> 1422e79e5
[SPARK-7406] [STREAMING] [WEBUI] Add tooltips for "Scheduling Delay", "Processing Time" and "Total Delay"
Screenshots:
tdas as we discussed offline
Author: zsxwing <zs...@gmail.com>
Closes #5952 from zsxwing/SPARK-7406 and squashes the following commits:
2b004ea [zsxwing] Merge branch 'master' into SPARK-7406
e9eb506 [zsxwing] Update tooltip contents
2215b2a [zsxwing] Add tooltips for "Scheduling Delay", "Processing Time" and "Total Delay"
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1422e79e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1422e79e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1422e79e
Branch: refs/heads/master
Commit: 1422e79e517ca14a6b0e178f015362d2e0d413c6
Parents: a4874b0
Author: zsxwing <zs...@gmail.com>
Authored: Tue May 12 14:41:21 2015 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Tue May 12 14:41:21 2015 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/ui/UIUtils.scala | 12 +++++++-----
.../org/apache/spark/streaming/ui/AllBatchesTable.scala | 11 ++++++++---
.../org/apache/spark/streaming/ui/StreamingPage.scala | 6 +++---
.../org/apache/spark/streaming/UISeleniumSuite.scala | 6 +++---
4 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1422e79e/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
index 441c97d..ad16bec 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -194,11 +194,7 @@ private[spark] object UIUtils extends Logging {
<a href={prependBaseUri(activeTab.basePath, "/" + tab.prefix + "/")}>{tab.name}</a>
</li>
}
- val helpButton: Seq[Node] = helpText.map { helpText =>
- <sup>
- (<a data-toggle="tooltip" data-placement="bottom" title={helpText}>?</a>)
- </sup>
- }.getOrElse(Seq.empty)
+ val helpButton: Seq[Node] = helpText.map(tooltip(_, "bottom")).getOrElse(Seq.empty)
<html>
<head>
@@ -375,6 +371,12 @@ private[spark] object UIUtils extends Logging {
</div>
}
+ def tooltip(text: String, position: String): Seq[Node] = {
+ <sup>
+ (<a data-toggle="tooltip" data-placement={position} title={text}>?</a>)
+ </sup>
+ }
+
/** Return a script element that automatically expands the DAG visualization on page load. */
def expandDagVizOnLoad(forJob: Boolean): Seq[Node] = {
<script type="text/javascript">
http://git-wip-us.apache.org/repos/asf/spark/blob/1422e79e/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala b/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala
index 2960b52..3619e12 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala
@@ -26,8 +26,11 @@ private[ui] abstract class BatchTableBase(tableId: String) {
protected def columns: Seq[Node] = {
<th>Batch Time</th>
<th>Input Size</th>
- <th>Scheduling Delay</th>
- <th>Processing Time</th>
+ <th>Scheduling Delay
+ {SparkUIUtils.tooltip("Time taken by Streaming scheduler to submit jobs of a batch", "top")}
+ </th>
+ <th>Processing Time
+ {SparkUIUtils.tooltip("Time taken to process all jobs of a batch", "top")}</th>
}
protected def baseRow(batch: BatchUIData): Seq[Node] = {
@@ -99,7 +102,9 @@ private[ui] class ActiveBatchTable(
private[ui] class CompletedBatchTable(batches: Seq[BatchUIData])
extends BatchTableBase("completed-batches-table") {
- override protected def columns: Seq[Node] = super.columns ++ <th>Total Delay</th>
+ override protected def columns: Seq[Node] = super.columns ++
+ <th>Total Delay
+ {SparkUIUtils.tooltip("Total time taken to handle a batch", "top")}</th>
override protected def renderRows: Seq[Node] = {
batches.flatMap(batch => <tr>{completedBatchRow(batch)}</tr>)
http://git-wip-us.apache.org/repos/asf/spark/blob/1422e79e/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala b/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala
index ecbebe5..ff0f2b1 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala
@@ -347,7 +347,7 @@ private[ui] class StreamingPage(parent: StreamingTab)
<tr>
<td style="vertical-align: middle;">
<div style="width: 160px;">
- <div><strong>Scheduling Delay</strong></div>
+ <div><strong>Scheduling Delay {SparkUIUtils.tooltip("Time taken by Streaming scheduler to submit jobs of a batch", "right")}</strong></div>
<div>Avg: {schedulingDelay.formattedAvg}</div>
</div>
</td>
@@ -357,7 +357,7 @@ private[ui] class StreamingPage(parent: StreamingTab)
<tr>
<td style="vertical-align: middle;">
<div style="width: 160px;">
- <div><strong>Processing Time</strong></div>
+ <div><strong>Processing Time {SparkUIUtils.tooltip("Time taken to process all jobs of a batch", "right")}</strong></div>
<div>Avg: {processingTime.formattedAvg}</div>
</div>
</td>
@@ -367,7 +367,7 @@ private[ui] class StreamingPage(parent: StreamingTab)
<tr>
<td style="vertical-align: middle;">
<div style="width: 160px;">
- <div><strong>Total Delay</strong></div>
+ <div><strong>Total Delay {SparkUIUtils.tooltip("Total time taken to handle a batch", "right")}</strong></div>
<div>Avg: {totalDelay.formattedAvg}</div>
</div>
</td>
http://git-wip-us.apache.org/repos/asf/spark/blob/1422e79e/streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala
----------------------------------------------------------------------
diff --git a/streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala
index 2211f62..441bbf9 100644
--- a/streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala
+++ b/streaming/src/test/scala/org/apache/spark/streaming/UISeleniumSuite.scala
@@ -116,12 +116,12 @@ class UISeleniumSuite
h4Text.exists(_.matches("Completed Batches \\(last \\d+ out of \\d+\\)")) should be (true)
findAll(cssSelector("""#active-batches-table th""")).map(_.text).toSeq should be {
- List("Batch Time", "Input Size", "Scheduling Delay", "Processing Time",
+ List("Batch Time", "Input Size", "Scheduling Delay (?)", "Processing Time (?)",
"Status")
}
findAll(cssSelector("""#completed-batches-table th""")).map(_.text).toSeq should be {
- List("Batch Time", "Input Size", "Scheduling Delay", "Processing Time",
- "Total Delay")
+ List("Batch Time", "Input Size", "Scheduling Delay (?)", "Processing Time (?)",
+ "Total Delay (?)")
}
val batchLinks =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org