From b0ce22e071da4cc62ec5e29abf7b1299b8e4a6b0 Mon Sep 17 00:00:00 2001
From: Aaron Davidson <aaron@databricks.com>
Date: Mon, 19 May 2014 20:55:26 -0700
Subject: [PATCH] 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
---
.../spark/scheduler/cluster/SparkDeploySchedulerBackend.scala | 2 ++
1 file changed, 2 insertions(+)
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()
}
}
--
GitLab