SPARK-6036 avoid race condition between eventlogListener and akka act…

…or system
apache · Feb 26, 2015 · 79b15b3 · 79b15b3
1 parent d20559b
commit 79b15b3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1382,6 +1382,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
         stopped = true
         env.metricsSystem.report()
         metadataCleaner.cancel()
+        eventLogger.foreach(_.stop())
         env.actorSystem.stop(heartbeatReceiver)
         cleaner.foreach(_.stop())
         dagScheduler.stop()
@@ -1392,7 +1393,6 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
         env.stop()
         SparkEnv.set(null)
         listenerBus.stop()
-        eventLogger.foreach(_.stop())
         logInfo("Successfully stopped SparkContext")
         SparkContext.clearActiveContext()
       } else {