You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/11/28 09:34:44 UTC
spark git commit: [BRANCH-1.1][SPARK-4626] Kill a task only if the
executorId is (still) registered with the scheduler
Repository: spark
Updated Branches:
refs/heads/branch-1.1 a59c4457e -> f8a4fd393
[BRANCH-1.1][SPARK-4626] Kill a task only if the executorId is (still) registered with the scheduler
v1.1 backport for #3483
Author: roxchkplusony <ro...@gmail.com>
Closes #3503 from roxchkplusony/bugfix/4626-1.1 and squashes the following commits:
234d350 [roxchkplusony] [SPARK-4626] Kill a task only if the executorId is (still) registered with the scheduler
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f8a4fd39
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f8a4fd39
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f8a4fd39
Branch: refs/heads/branch-1.1
Commit: f8a4fd393d2eb1a58429653050ef036ca9f5aa2d
Parents: a59c445
Author: roxchkplusony <ro...@gmail.com>
Authored: Fri Nov 28 00:34:41 2014 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Fri Nov 28 00:34:41 2014 -0800
----------------------------------------------------------------------
.../scheduler/cluster/CoarseGrainedSchedulerBackend.scala | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f8a4fd39/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
index e8a3a3b..ae94b38 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
@@ -118,7 +118,12 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, actorSystem: A
makeOffers()
case KillTask(taskId, executorId, interruptThread) =>
- executorActor(executorId) ! KillTask(taskId, executorId, interruptThread)
+ if (executorActor.contains(executorId)) {
+ executorActor(executorId) ! KillTask(taskId, executorId, interruptThread)
+ } else {
+ // Ignoring the task kill since the executor is not registered.
+ logWarning(s"Attempted to kill task $taskId for unknown executor $executorId.")
+ }
case StopDriver =>
sender ! true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org