spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [SPARK-12755][CORE] Stop the event logger before the DAG scheduler
Date Mon, 25 Jan 2016 09:51:57 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 88114d3d8 -> b40e58cf2


[SPARK-12755][CORE] Stop the event logger before the DAG scheduler

[SPARK-12755][CORE] Stop the event logger before the DAG scheduler to avoid a race condition
where the standalone master attempts to build the app's history UI before the event log is
stopped.

This contribution is my original work, and I license this work to the Spark project under
the project's open source license.

Author: Michael Allman <michael@videoamp.com>

Closes #10700 from mallman/stop_event_logger_first.

(cherry picked from commit 4ee8191e57cb823a23ceca17908af86e70354554)
Signed-off-by: Sean Owen <sowen@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b40e58cf
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b40e58cf
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b40e58cf

Branch: refs/heads/branch-1.6
Commit: b40e58cf251c22c6b0ba383cc7e67ef6b07d8ec5
Parents: 88114d3
Author: Michael Allman <michael@videoamp.com>
Authored: Mon Jan 25 09:51:41 2016 +0000
Committer: Sean Owen <sowen@cloudera.com>
Committed: Mon Jan 25 09:51:51 2016 +0000

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/SparkContext.scala | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/b40e58cf/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 add3f04..8f5689c 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1726,12 +1726,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()
@@ -1741,6 +1735,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)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message