spark git commit: [SPARK-6036][CORE] avoid race condition between eventlogListener and akka actor system

2015-03-13 Thread srowen 
Repository: spark
Updated Branches:
  refs/heads/branch-1.3 4aa41327d - f81611dca


[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 liye.zh...@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/f81611dc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f81611dc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f81611dc

Branch: refs/heads/branch-1.3
Commit: f81611dca7ce97ebd26262086ac0e2b5e5f997e5
Parents: 4aa4132
Author: Zhang, Liye liye.zh...@intel.com
Authored: Thu Feb 26 23:11:43 2015 -0800
Committer: Sean Owen so...@cloudera.com
Committed: Fri Mar 13 18:06:17 2015 +

--
 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/f81611dc/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 05c3210..f80338e 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1375,17 +1375,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-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [SPARK-6036][CORE] avoid race condition between eventlogListener and akka actor system

2015-02-26 Thread andrewor14 
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 liye.zh...@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: 8cd1692c9092150107bed2951633cbf945f6
Parents: 0375a41
Author: Zhang, Liye liye.zh...@intel.com
Authored: Thu Feb 26 23:11:43 2015 -0800
Committer: Andrew Or and...@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-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org