Merge pull request #15 from markhamstra/SPARK-1689

jhartlaub · jhartlaub · commit be72f41f5a66 · 2014-05-30T17:33:01.000-07:00
SKIPME backport SPARK-1689
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
@@ -81,6 +81,8 @@ private[spark] class SparkDeploySchedulerBackend(
     if (!stopping) {
       logError("Spark cluster looks dead, giving up.")
       scheduler.error("Spark cluster looks down")
+      // Ensure the application terminates, as we can no longer run jobs.
+      sc.stop()
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ private[spark] class SparkDeploySchedulerBackend(`
`81`	`81`	`if (!stopping) {`
`82`	`82`	`logError("Spark cluster looks dead, giving up.")`
`83`	`83`	`scheduler.error("Spark cluster looks down")`
	`84`	`+ // Ensure the application terminates, as we can no longer run jobs.`
	`85`	`+ sc.stop()`
`84`	`86`	`}`
`85`	`87`	`}`
`86`	`88`