diff options
author | Zhang, Liye <liye.zhang@intel.com> | 2015-02-26 23:11:43 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2015-02-26 23:11:43 -0800 |
commit | 8cd1692c9092150107bed27777951633cbf945f6 (patch) | |
tree | 94839375872f184412aa1be2c8a59dc62cb20dae | |
parent | 0375a413b8a009f5820897691570a1273ee25b97 (diff) | |
download | spark-8cd1692c9092150107bed27777951633cbf945f6.tar.gz spark-8cd1692c9092150107bed27777951633cbf945f6.tar.bz2 spark-8cd1692c9092150107bed27777951633cbf945f6.zip |
[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.zhang@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
-rw-r--r-- | core/src/main/scala/org/apache/spark/SparkContext.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index d3948d4e6d..3cd0c218a3 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 { |