diff options
| author | Lars Albertsson <lalle@spotify.com> | 2014-06-11 10:54:42 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-06-11 10:56:01 -0700 |
| commit | 684a93a7263a79c612275ba36e06f6438162ff28 (patch) | |
| tree | a7da83541c46c6ec26ed7e7aa85982f61571f6f3 /streaming/src/main | |
| parent | 9ef076510e832a4cd56d692937b597e573187416 (diff) | |
| download | spark-684a93a7263a79c612275ba36e06f6438162ff28.tar.gz spark-684a93a7263a79c612275ba36e06f6438162ff28.tar.bz2 spark-684a93a7263a79c612275ba36e06f6438162ff28.zip | |
SPARK-2113: awaitTermination() after stop() will hang in Spark Stremaing
Author: Lars Albertsson <lalle@spotify.com>
Closes #1001 from lallea/contextwaiter_stopped and squashes the following commits:
93cd314 [Lars Albertsson] Mend StreamingContext stop() followed by awaitTermination().
(cherry picked from commit 4d5c12aa1c54c49377a4bafe3bcc4993d5e1a552)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'streaming/src/main')
| -rw-r--r-- | streaming/src/main/scala/org/apache/spark/streaming/ContextWaiter.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ContextWaiter.scala b/streaming/src/main/scala/org/apache/spark/streaming/ContextWaiter.scala index 86753360a0..a0aeacbc73 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/ContextWaiter.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/ContextWaiter.scala @@ -27,6 +27,7 @@ private[streaming] class ContextWaiter { } def notifyStop() = synchronized { + stopped = true notifyAll() } |