You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2015/05/02 02:42:16 UTC
spark git commit: [SPARK-7309] [CORE] [STREAMING] Shutdown the thread
pools in ReceivedBlockHandler and DAGScheduler
Repository: spark
Updated Branches:
refs/heads/master 98e704580 -> ebc25a4dd
[SPARK-7309] [CORE] [STREAMING] Shutdown the thread pools in ReceivedBlockHandler and DAGScheduler
Shutdown the thread pools in ReceivedBlockHandler and DAGScheduler when stopping them.
Author: zsxwing <zs...@gmail.com>
Closes #5845 from zsxwing/SPARK-7309 and squashes the following commits:
6c004fd [zsxwing] Shutdown the thread pools in ReceivedBlockHandler and DAGScheduler
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ebc25a4d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ebc25a4d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ebc25a4d
Branch: refs/heads/master
Commit: ebc25a4ddfe07a67668217cec59893bc3b8cf730
Parents: 98e7045
Author: zsxwing <zs...@gmail.com>
Authored: Fri May 1 17:41:55 2015 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Fri May 1 17:41:55 2015 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala | 1 +
.../org/apache/spark/streaming/receiver/ReceivedBlockHandler.scala | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ebc25a4d/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
index 05b8ab0..5d81291 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
@@ -1399,6 +1399,7 @@ class DAGScheduler(
def stop() {
logInfo("Stopping DAGScheduler")
+ messageScheduler.shutdownNow()
eventProcessLoop.stop()
taskScheduler.stop()
}
http://git-wip-us.apache.org/repos/asf/spark/blob/ebc25a4d/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceivedBlockHandler.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceivedBlockHandler.scala b/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceivedBlockHandler.scala
index 4b3d9ee..651b534 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceivedBlockHandler.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceivedBlockHandler.scala
@@ -190,6 +190,7 @@ private[streaming] class WriteAheadLogBasedBlockHandler(
def stop() {
writeAheadLog.close()
+ executionContext.shutdown()
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org