You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/02/27 08:11:46 UTC
spark git commit: [SPARK-6036][CORE] avoid race condition between
eventlogListener and akka actor system
Repository: spark
Updated Branches:
refs/heads/master 0375a413b -> 8cd1692c9
[SPARK-6036][CORE] avoid race condition between eventlogListener and akka actor system
For detail description, pls refer to [SPARK-6036](https://issues.apache.org/jira/browse/SPARK-6036).
Author: Zhang, Liye <li...@intel.com>
Closes #4785 from liyezhang556520/EventLogInProcess and squashes the following commits:
8b0b0a6 [Zhang, Liye] stop listener after DAGScheduler
79b15b3 [Zhang, Liye] SPARK-6036 avoid race condition between eventlogListener and akka actor system
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8cd1692c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8cd1692c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8cd1692c
Branch: refs/heads/master
Commit: 8cd1692c9092150107bed27777951633cbf945f6
Parents: 0375a41
Author: Zhang, Liye <li...@intel.com>
Authored: Thu Feb 26 23:11:43 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Thu Feb 26 23:11:43 2015 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/8cd1692c/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index d3948d4..3cd0c21 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1389,17 +1389,17 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
stopped = true
env.metricsSystem.report()
metadataCleaner.cancel()
- env.actorSystem.stop(heartbeatReceiver)
cleaner.foreach(_.stop())
dagScheduler.stop()
dagScheduler = null
+ listenerBus.stop()
+ eventLogger.foreach(_.stop())
+ env.actorSystem.stop(heartbeatReceiver)
progressBar.foreach(_.stop())
taskScheduler = null
// TODO: Cache.stop()?
env.stop()
SparkEnv.set(null)
- listenerBus.stop()
- eventLogger.foreach(_.stop())
logInfo("Successfully stopped SparkContext")
SparkContext.clearActiveContext()
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org