SPARK-2645: Fix for SparkContext stop behavior

vanzin · Jun 25, 2015 · 58dba70 · 58dba70
1 parent 380c5b0
commit 58dba70
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -93,7 +93,7 @@ class SparkEnv (
 
   private[spark] def stop() {
 
-    if(!isStopped) {
+    if (!isStopped) {
       isStopped = true
       try {
         pythonWorkers.foreach { case (key, worker) => worker.stop()}

diff --git a/core/src/test/scala/org/apache/spark/SparkContextSuite.scala b/core/src/test/scala/org/apache/spark/SparkContextSuite.scala
@@ -30,6 +30,7 @@ import org.apache.spark.util.Utils
 
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
+import scala.util.control.NonFatal
 
 class SparkContextSuite extends SparkFunSuite with LocalSparkContext {
 
@@ -272,4 +273,24 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext {
       sc.stop()
     }
   }
+
+  test("calling multiple sc.stop() must not throw uncaught exception(50) from sparkenv") {
+    var threwNoOrOnlyExceptedException = true
+    try {
+      sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local"))
+      val cnt = sc.parallelize(1 to 4).count()
+      sc.cancelAllJobs()
+      sc.stop()
+      // call stop second time
+      sc.stop()
+    } catch {
+      case e: ServerStateException =>
+        // assert(!e.getMessage.contains("Server is already stopped"))
+        threwNoOrOnlyExceptedException = false
+      case NonFatal(e) =>
+        threwNoOrOnlyExceptedException = true
+    } finally {
+      assert(threwNoOrOnlyExceptedException == true)
+    }
+  }
 }