Fix for SparkContext stop behavior

marmbrus · Jun 26, 2015 · a5a7d7f · a5a7d7f
1 parent 9193a0c
commit a5a7d7f
Showing 1 changed file with 3 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
@@ -107,8 +107,10 @@ class SparkEnv (
         outputCommitCoordinator.stop()
         rpcEnv.shutdown()
       } catch {
-        case NonFatal(e) =>
+        case e: ServerStateException =>
           logInfo("Exception while SparkEnv stop", e)
+        case NonFatal(e) =>
+          throw e;
       }
 
       // Unfortunately Akka's awaitTermination doesn't actually wait for the Netty server to shut