Skip to content

[SPARK-28839][CORE] Avoids NPE in context cleaner when dynamic allocation and shuffle service are on #25551

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
HyukjinKwon wants to merge 3 commits into from
Closed

[SPARK-28839][CORE] Avoids NPE in context cleaner when dynamic allocation and shuffle service are on #25551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4363ef1
Avoids NPE in context cleaner when shuffle service is on
HyukjinKwon Aug 22, 2019
4f5de95
Address comments
HyukjinKwon Aug 23, 2019
c8b0da9
Fix comments
HyukjinKwon Aug 23, 2019
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
9 changes: 6 additions & 3 deletions core/src/main/scala/org/apache/spark/scheduler/dynalloc/ExecutorMonitor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,12 @@ private[spark] class ExecutorMonitor(
override def rddCleaned(rddId: Int): Unit = { }

override def shuffleCleaned(shuffleId: Int): Unit = {
// Because this is called in a completely separate thread, we post a custom event to the
// listener bus so that the internal state is safely updated.
listenerBus.post(ShuffleCleanedEvent(shuffleId))
// Only post the event if tracking is enabled
if (shuffleTrackingEnabled) {
// Because this is called in a completely separate thread, we post a custom event to the
// listener bus so that the internal state is safely updated.
listenerBus.post(ShuffleCleanedEvent(shuffleId))
}
}

override def broadcastCleaned(broadcastId: Long): Unit = { }
Expand Down
13 changes: 13 additions & 0 deletions core/src/test/scala/org/apache/spark/scheduler/dynalloc/ExecutorMonitorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,19 @@ class ExecutorMonitorSuite extends SparkFunSuite {
assert(monitor.timedOutExecutors(idleDeadline) === Seq("1"))
}


test("SPARK-28839: Avoids NPE in context cleaner when shuffle service is on") {
val bus = mockListenerBus()
conf.set(DYN_ALLOCATION_SHUFFLE_TRACKING, true).set(SHUFFLE_SERVICE_ENABLED, true)
monitor = new ExecutorMonitor(conf, client, bus, clock) {
override def onOtherEvent(event: SparkListenerEvent): Unit = {
Copy link
Contributor

@vanzin vanzin Aug 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could have used mockito's verify instead of this, but this is ok.

throw new IllegalStateException("No event should be sent.")
}
}
monitor.onExecutorAdded(SparkListenerExecutorAdded(clock.getTimeMillis(), "1", null))
monitor.shuffleCleaned(0)
}

test("shuffle tracking with multiple executors and concurrent jobs") {
val bus = mockListenerBus()
conf.set(DYN_ALLOCATION_SHUFFLE_TRACKING, true).set(SHUFFLE_SERVICE_ENABLED, false)
Expand Down