Merge pull request #946 from ScrapCodes/scala-2.10

Fixed non termination of Executor backend, when sc.stop is not called and system.exit instead.
ankurdave · Oct 4, 2013 · 3fe12cc · 3fe12cc
2 parents afd03b2 + 9865fd6
commit 3fe12cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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)
   }