aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authortedyu <yuzhihong@gmail.com>2015-11-17 22:47:53 -0800
committerTathagata Das <tathagata.das1565@gmail.com>2015-11-17 22:47:53 -0800
commit446738e51fcda50cf2dc44123ff6bf12a1611dc0 (patch)
tree8940cccf64649eedfc1834e20146d7b1761cec5c /core
parent8fb775ba874dd0488667bf299a7b49760062dc00 (diff)
downloadspark-446738e51fcda50cf2dc44123ff6bf12a1611dc0.tar.gz
spark-446738e51fcda50cf2dc44123ff6bf12a1611dc0.tar.bz2
spark-446738e51fcda50cf2dc44123ff6bf12a1611dc0.zip
[SPARK-11761] Prevent the call to StreamingContext#stop() in the listener bus's thread
See discussion toward the tail of https://github.com/apache/spark/pull/9723 From zsxwing : ``` The user should not call stop or other long-time work in a listener since it will block the listener thread, and prevent from stopping SparkContext/StreamingContext. I cannot see an approach since we need to stop the listener bus's thread before stopping SparkContext/StreamingContext totally. ``` Proposed solution is to prevent the call to StreamingContext#stop() in the listener bus's thread. Author: tedyu <yuzhihong@gmail.com> Closes #9741 from tedyu/master.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/util/AsynchronousListenerBus.scala46
1 files changed, 28 insertions, 18 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/AsynchronousListenerBus.scala b/core/src/main/scala/org/apache/spark/util/AsynchronousListenerBus.scala
index c20627b056..6c1fca71f2 100644
--- a/core/src/main/scala/org/apache/spark/util/AsynchronousListenerBus.scala
+++ b/core/src/main/scala/org/apache/spark/util/AsynchronousListenerBus.scala
@@ -19,6 +19,7 @@ package org.apache.spark.util
import java.util.concurrent._
import java.util.concurrent.atomic.AtomicBoolean
+import scala.util.DynamicVariable
import org.apache.spark.SparkContext
@@ -60,25 +61,27 @@ private[spark] abstract class AsynchronousListenerBus[L <: AnyRef, E](name: Stri
private val listenerThread = new Thread(name) {
setDaemon(true)
override def run(): Unit = Utils.tryOrStopSparkContext(sparkContext) {
- while (true) {
- eventLock.acquire()
- self.synchronized {
- processingEvent = true
- }
- try {
- val event = eventQueue.poll
- if (event == null) {
- // Get out of the while loop and shutdown the daemon thread
- if (!stopped.get) {
- throw new IllegalStateException("Polling `null` from eventQueue means" +
- " the listener bus has been stopped. So `stopped` must be true")
- }
- return
- }
- postToAll(event)
- } finally {
+ AsynchronousListenerBus.withinListenerThread.withValue(true) {
+ while (true) {
+ eventLock.acquire()
self.synchronized {
- processingEvent = false
+ processingEvent = true
+ }
+ try {
+ val event = eventQueue.poll
+ if (event == null) {
+ // Get out of the while loop and shutdown the daemon thread
+ if (!stopped.get) {
+ throw new IllegalStateException("Polling `null` from eventQueue means" +
+ " the listener bus has been stopped. So `stopped` must be true")
+ }
+ return
+ }
+ postToAll(event)
+ } finally {
+ self.synchronized {
+ processingEvent = false
+ }
}
}
}
@@ -177,3 +180,10 @@ private[spark] abstract class AsynchronousListenerBus[L <: AnyRef, E](name: Stri
*/
def onDropEvent(event: E): Unit
}
+
+private[spark] object AsynchronousListenerBus {
+ /* Allows for Context to check whether stop() call is made within listener thread
+ */
+ val withinListenerThread: DynamicVariable[Boolean] = new DynamicVariable[Boolean](false)
+}
+