You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/10/04 19:55:36 UTC
[49/50] git commit: Fixed non termination of Executor backend,
when sc.stop is not called.
Fixed non termination of Executor backend, when sc.stop is not called.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/9865fd6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/9865fd6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/9865fd6a
Branch: refs/heads/scala-2.10
Commit: 9865fd6aa07fd722c6782ec8001b732c39a98d45
Parents: 42f30b5
Author: Prashant Sharma <pr...@imaginea.com>
Authored: Mon Sep 30 18:09:12 2013 +0530
Committer: Prashant Sharma <pr...@imaginea.com>
Committed: Mon Sep 30 18:09:12 2013 +0530
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 2 +-
.../org/apache/spark/executor/StandaloneExecutorBackend.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9865fd6a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
index 1f04c1e..3904b70 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
@@ -165,7 +165,7 @@ private[spark] class Worker(
logInfo("Asked to kill unknown executor " + fullId)
}
- case _: Terminated | DisassociatedEvent | AssociationErrorEvent =>
+ case DisassociatedEvent(_, _, _) =>
masterDisconnected()
case RequestWorkerState => {
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9865fd6a/core/src/main/scala/org/apache/spark/executor/StandaloneExecutorBackend.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/executor/StandaloneExecutorBackend.scala b/core/src/main/scala/org/apache/spark/executor/StandaloneExecutorBackend.scala
index 46f0ef2..f705a56 100644
--- a/core/src/main/scala/org/apache/spark/executor/StandaloneExecutorBackend.scala
+++ b/core/src/main/scala/org/apache/spark/executor/StandaloneExecutorBackend.scala
@@ -81,7 +81,7 @@ private[spark] class StandaloneExecutorBackend(
executor.launchTask(this, taskDesc.taskId, taskDesc.serializedTask)
}
- case _: Terminated | DisassociatedEvent | AssociationErrorEvent =>
+ case DisassociatedEvent(_, _, _) =>
logError("Driver terminated or disconnected! Shutting down.")
System.exit(1)
}