From 9865fd6aa07fd722c6782ec8001b732c39a98d45 Mon Sep 17 00:00:00 2001
From: Prashant Sharma <prashant.s@imaginea.com>
Date: Mon, 30 Sep 2013 18:09:12 +0530
Subject: [PATCH] Fixed non termination of Executor backend, when sc.stop is
not called.
---
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(-)
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)
}
--
GitLab