Skip to content

Commit fd50fa4

Browse files
committed
Revert "[SPARK-11572] Exit AsynchronousListenerBus thread when stop() is called"
This reverts commit 3e0a6cf.
1 parent b58765c commit fd50fa4

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

core/src/main/scala/org/apache/spark/util/AsynchronousListenerBus.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,15 @@ private[spark] abstract class AsynchronousListenerBus[L <: AnyRef, E](name: Stri
6666
processingEvent = true
6767
}
6868
try {
69-
if (stopped.get()) {
69+
val event = eventQueue.poll
70+
if (event == null) {
7071
// Get out of the while loop and shutdown the daemon thread
72+
if (!stopped.get) {
73+
throw new IllegalStateException("Polling `null` from eventQueue means" +
74+
" the listener bus has been stopped. So `stopped` must be true")
75+
}
7176
return
7277
}
73-
val event = eventQueue.poll
74-
assert(event != null, "event queue was empty but the listener bus was not stopped")
7578
postToAll(event)
7679
} finally {
7780
self.synchronized {

0 commit comments

Comments
 (0)