-
Notifications
You must be signed in to change notification settings - Fork 28.1k
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.
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
[SPARK-6796][Streaming][WebUI] Add "Active Batches" and "Completed Batches" lists to StreamingPage #5434
Closed
Closed
[SPARK-6796][Streaming][WebUI] Add "Active Batches" and "Completed Batches" lists to StreamingPage #5434
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6ceffb3
Add "Active Batches" and "Completed Batches" lists to StreamingPage
zsxwing d18ab7d
Fix the code style
zsxwing b248787
Add tests to verify the new tables
zsxwing 86b5e7f
Make BatchTableBase abstract
zsxwing a12ad7b
Change 'records' to 'events' in the UI
zsxwing a69c091
Show the number of total completed batches too
zsxwing 2525336
Rename 'Processed batches' and 'Waiting batches' and also add links
zsxwing f40e0a9
Merge branch 'master' into SPARK-6796
zsxwing 6f3078e
Make 'startTime' readable
zsxwing 51b792e
Fix the unit test
zsxwing be50fc6
Fix the code style
zsxwing File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
114 changes: 114 additions & 0 deletions
114
streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.spark.streaming.ui | ||
|
||
import scala.xml.Node | ||
|
||
import org.apache.spark.streaming.scheduler.BatchInfo | ||
import org.apache.spark.ui.UIUtils | ||
|
||
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> | ||
} | ||
|
||
protected def baseRow(batch: BatchInfo): Seq[Node] = { | ||
val batchTime = batch.batchTime.milliseconds | ||
val formattedBatchTime = UIUtils.formatDate(batch.batchTime.milliseconds) | ||
val eventCount = batch.receivedBlockInfo.values.map { | ||
receivers => receivers.map(_.numRecords).sum | ||
}.sum | ||
val schedulingDelay = batch.schedulingDelay | ||
val formattedSchedulingDelay = schedulingDelay.map(UIUtils.formatDuration).getOrElse("-") | ||
val processingTime = batch.processingDelay | ||
val formattedProcessingTime = processingTime.map(UIUtils.formatDuration).getOrElse("-") | ||
|
||
<td sorttable_customkey={batchTime.toString}>{formattedBatchTime}</td> | ||
<td sorttable_customkey={eventCount.toString}>{eventCount.toString} events</td> | ||
<td sorttable_customkey={schedulingDelay.getOrElse(Long.MaxValue).toString}> | ||
{formattedSchedulingDelay} | ||
</td> | ||
<td sorttable_customkey={processingTime.getOrElse(Long.MaxValue).toString}> | ||
{formattedProcessingTime} | ||
</td> | ||
} | ||
|
||
private def batchTable: Seq[Node] = { | ||
<table id={tableId} class="table table-bordered table-striped table-condensed sortable"> | ||
<thead> | ||
{columns} | ||
</thead> | ||
<tbody> | ||
{renderRows} | ||
</tbody> | ||
</table> | ||
} | ||
|
||
def toNodeSeq: Seq[Node] = { | ||
batchTable | ||
} | ||
|
||
/** | ||
* Return HTML for all rows of this table. | ||
*/ | ||
protected def renderRows: Seq[Node] | ||
} | ||
|
||
private[ui] class ActiveBatchTable(runningBatches: Seq[BatchInfo], waitingBatches: Seq[BatchInfo]) | ||
extends BatchTableBase("active-batches-table") { | ||
|
||
override protected def columns: Seq[Node] = super.columns ++ <th>Status</th> | ||
|
||
override protected def renderRows: Seq[Node] = { | ||
// The "batchTime"s of "waitingBatches" must be greater than "runningBatches"'s, so display | ||
// waiting batches before running batches | ||
waitingBatches.flatMap(batch => <tr>{waitingBatchRow(batch)}</tr>) ++ | ||
runningBatches.flatMap(batch => <tr>{runningBatchRow(batch)}</tr>) | ||
} | ||
|
||
private def runningBatchRow(batch: BatchInfo): Seq[Node] = { | ||
baseRow(batch) ++ <td>processing</td> | ||
} | ||
|
||
private def waitingBatchRow(batch: BatchInfo): Seq[Node] = { | ||
baseRow(batch) ++ <td>queued</td> | ||
} | ||
} | ||
|
||
private[ui] class CompletedBatchTable(batches: Seq[BatchInfo]) | ||
extends BatchTableBase("completed-batches-table") { | ||
|
||
override protected def columns: Seq[Node] = super.columns ++ <th>Total Delay</th> | ||
|
||
override protected def renderRows: Seq[Node] = { | ||
batches.flatMap(batch => <tr>{completedBatchRow(batch)}</tr>) | ||
} | ||
|
||
private def completedBatchRow(batch: BatchInfo): Seq[Node] = { | ||
val totalDelay = batch.totalDelay | ||
val formattedTotalDelay = totalDelay.map(UIUtils.formatDuration).getOrElse("-") | ||
baseRow(batch) ++ | ||
<td sorttable_customkey={totalDelay.getOrElse(Long.MaxValue).toString}> | ||
{formattedTotalDelay} | ||
</td> | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One small nit that I noticed when i ran it myself. This says
events
where as else where in the UI it saysrecords
. Lets change it toevents
to keep things consistent.