diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-09-30 18:09:12 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-09-30 18:09:12 +0530 |
| commit | 9865fd6aa07fd722c6782ec8001b732c39a98d45 (patch) | |
| tree | 677d54a111ac867862edadcee8f6d21b4535d94f | |
| parent | 42f30b5590b229b2f672e7dbc4485fbf58bfb999 (diff) | |
| download | spark-9865fd6aa07fd722c6782ec8001b732c39a98d45.tar.gz spark-9865fd6aa07fd722c6782ec8001b732c39a98d45.tar.bz2 spark-9865fd6aa07fd722c6782ec8001b732c39a98d45.zip | |
Fixed non termination of Executor backend, when sc.stop is not called.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/executor/StandaloneExecutorBackend.scala | 2 |
2 files changed, 2 insertions, 2 deletions
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 1f04c1eea5..3904b701b2 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 => { 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 46f0ef2cc6..f705a5631a 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) } |