[SPARK-4787] Ensure that call to stop() doesn't lose the exception by…

… using a finally block.
apache · Dec 30, 2014 · 5661e01 · 5661e01
1 parent 2172578
commit 5661e01
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -330,9 +330,11 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
     dagScheduler = new DAGScheduler(this)
   } catch {
     case e: Exception => {
-      stop()
-      throw
-        new SparkException("DAGScheduler cannot be initialized due to %s".format(e.getMessage))
+      try {
+        stop()
+      } finally {
+        throw new SparkException("Error while constructing DAGScheduler", e)
+      }
     }
   }