Skip to content

[SPARK-6860][Streaming][WebUI] Fix the possible inconsistency of StreamingPage #5470

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

Closed
zsxwing wants to merge 2 commits into from
Closed

[SPARK-6860][Streaming][WebUI] Fix the possible inconsistency of StreamingPage #5470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7182498
Add synchronized to make sure we have a consistent view of StreamingJ…
zsxwing Apr 11, 2015
cec6f92
Add missing 'synchronized' in StreamingJobProgressListener
zsxwing Apr 11, 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
10 changes: 5 additions & 5 deletions streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingJobProgressListener.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private[streaming] class StreamingJobProgressListener(ssc: StreamingContext)
}.toMap
}

def lastReceivedBatchRecords: Map[Int, Long] = {
def lastReceivedBatchRecords: Map[Int, Long] = synchronized {
val lastReceivedBlockInfoOption = lastReceivedBatch.map(_.receivedBlockInfo)
lastReceivedBlockInfoOption.map { lastReceivedBlockInfo =>
(0 until numReceivers).map { receiverId =>
Expand All @@ -160,19 +160,19 @@ private[streaming] class StreamingJobProgressListener(ssc: StreamingContext)
}
}

def receiverInfo(receiverId: Int): Option[ReceiverInfo] = {
def receiverInfo(receiverId: Int): Option[ReceiverInfo] = synchronized {
receiverInfos.get(receiverId)
}

def lastCompletedBatch: Option[BatchInfo] = {
def lastCompletedBatch: Option[BatchInfo] = synchronized {
completedBatchInfos.sortBy(_.batchTime)(Time.ordering).lastOption
}

def lastReceivedBatch: Option[BatchInfo] = {
def lastReceivedBatch: Option[BatchInfo] = synchronized {
retainedBatches.lastOption
}

private def retainedBatches: Seq[BatchInfo] = synchronized {
private def retainedBatches: Seq[BatchInfo] = {
(waitingBatchInfos.values.toSeq ++
runningBatchInfos.values.toSeq ++ completedBatchInfos).sortBy(_.batchTime)(Time.ordering)
}
Expand Down
3 changes: 2 additions & 1 deletion streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ private[ui] class StreamingPage(parent: StreamingTab)

/** Render the page */
def render(request: HttpServletRequest): Seq[Node] = {
val content =
val content = listener.synchronized {
generateBasicStats() ++ <br></br> ++
<h4>Statistics over last {listener.retainedCompletedBatches.size} processed batches</h4> ++
generateReceiverStats() ++
generateBatchStatsTable()
}
UIUtils.headerSparkPage("Streaming", content, parent, Some(5000))
}

Expand Down