diff options
| author | Aaron Davidson <aaron@databricks.com> | 2014-05-19 20:55:26 -0700 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2014-05-19 20:55:26 -0700 |
| commit | b0ce22e071da4cc62ec5e29abf7b1299b8e4a6b0 (patch) | |
| tree | 3c5c1d094fea06978450bb3a57e6a751703f6fc9 /core | |
| parent | 6a2c5c610c259f62cb12d8cfc18bf59cdb334bb2 (diff) | |
| download | spark-b0ce22e071da4cc62ec5e29abf7b1299b8e4a6b0.tar.gz spark-b0ce22e071da4cc62ec5e29abf7b1299b8e4a6b0.tar.bz2 spark-b0ce22e071da4cc62ec5e29abf7b1299b8e4a6b0.zip | |
SPARK-1689: Spark application should die when removed by Master
scheduler.error() will mask the error if there are active tasks. Being removed is a cataclysmic event for Spark applications, and should probably be treated as such.
Author: Aaron Davidson <aaron@databricks.com>
Closes #832 from aarondav/i-love-u and squashes the following commits:
9f1200f [Aaron Davidson] SPARK-1689: Spark application should die when removed by Master
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala | 2 |
1 files changed, 2 insertions, 0 deletions
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 index 9768670855..9c07b3f7b6 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala @@ -88,6 +88,8 @@ private[spark] class SparkDeploySchedulerBackend( if (!stopping) { logError("Application has been killed. Reason: " + reason) scheduler.error(reason) + // Ensure the application terminates, as we can no longer run jobs. + sc.stop() } } |