From 915db1620caee57126b436e9089c4715b5f1b766 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Tue, 3 Mar 2015 01:02:05 -0800 Subject: [PATCH 1/2] Move code into code --- core/src/main/scala/org/apache/spark/SparkContext.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index e231e8369dbac..9926d610ce28b 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -1392,9 +1392,9 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli /** Shut down the SparkContext. */ def stop() { SparkContext.SPARK_CONTEXT_CONSTRUCTOR_LOCK.synchronized { - postApplicationEnd() - ui.foreach(_.stop()) if (!stopped) { + postApplicationEnd() + ui.foreach(_.stop()) stopped = true env.metricsSystem.report() metadataCleaner.cancel() From a14afc5f34128bf0f1abdf98bd886f9f2f68f7b0 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Tue, 3 Mar 2015 13:36:02 -0800 Subject: [PATCH 2/2] Move code after code --- core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index 9926d610ce28b..1a0bee4e3aea9 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -1393,9 +1393,9 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli def stop() { SparkContext.SPARK_CONTEXT_CONSTRUCTOR_LOCK.synchronized { if (!stopped) { + stopped = true postApplicationEnd() ui.foreach(_.stop()) - stopped = true env.metricsSystem.report() metadataCleaner.cancel() cleaner.foreach(_.stop())