aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/src/main/scala/org/apache/spark/SparkContext.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index d7c605a583..fa8c0f524b 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1675,12 +1675,6 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
Utils.tryLogNonFatalError {
_executorAllocationManager.foreach(_.stop())
}
- if (_dagScheduler != null) {
- Utils.tryLogNonFatalError {
- _dagScheduler.stop()
- }
- _dagScheduler = null
- }
if (_listenerBusStarted) {
Utils.tryLogNonFatalError {
listenerBus.stop()
@@ -1690,6 +1684,12 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
Utils.tryLogNonFatalError {
_eventLogger.foreach(_.stop())
}
+ if (_dagScheduler != null) {
+ Utils.tryLogNonFatalError {
+ _dagScheduler.stop()
+ }
+ _dagScheduler = null
+ }
if (env != null && _heartbeatReceiver != null) {
Utils.tryLogNonFatalError {
env.rpcEnv.stop(_heartbeatReceiver)