diff options
| author | zsxwing <zsxwing@gmail.com> | 2015-05-12 14:41:21 -0700 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2015-05-12 14:41:21 -0700 |
| commit | 1422e79e517ca14a6b0e178f015362d2e0d413c6 (patch) | |
| tree | d28d67c4460418518a703aaa8a5cc13665ca2de0 /streaming | |
| parent | a4874b0d1820efd24071108434a4d89429473fe3 (diff) | |
| download | spark-1422e79e517ca14a6b0e178f015362d2e0d413c6.tar.gz spark-1422e79e517ca14a6b0e178f015362d2e0d413c6.tar.bz2 spark-1422e79e517ca14a6b0e178f015362d2e0d413c6.zip | |
[SPARK-7406] [STREAMING] [WEBUI] Add tooltips for "Scheduling Delay", "Processing Time" and "Total Delay"
Screenshots:
tdas as we discussed offline
Author: zsxwing <zsxwing@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"
Diffstat (limited to 'streaming')
3 files changed, 14 insertions, 9 deletions
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 2960b528d4..3619e129ad 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>) 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 ecbebe5c6c..ff0f2b18dc 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> 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 2211f62383..441bbf95d0 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 = |