From f2b597022b4fc4023c238e5b5a9824946f84f84e Mon Sep 17 00:00:00 2001 From: lianhuiwang Date: Fri, 23 May 2014 22:02:57 +0800 Subject: [PATCH 1/2] bugfix worker DriverStateChanged state should match DriverState.FAILED --- core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 2 ++ 1 file changed, 2 insertions(+) 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 fb9cc116cd08b..e7ff855010488 100755 --- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala @@ -311,6 +311,8 @@ private[spark] class Worker( state match { case DriverState.ERROR => logWarning(s"Driver $driverId failed with unrecoverable exception: ${exception.get}") + case DriverState.FAILED => + logWarning(s"Driver $driverId failed with state $state") case DriverState.FINISHED => logInfo(s"Driver $driverId exited successfully") case DriverState.KILLED => From 480ce949a83c0d854078b38f5665f3369cf759eb Mon Sep 17 00:00:00 2001 From: lianhuiwang Date: Sat, 24 May 2014 23:24:37 +0800 Subject: [PATCH 2/2] address aarondav comments --- .../main/scala/org/apache/spark/deploy/worker/Worker.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 e7ff855010488..e3533bdf8e03e 100755 --- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala @@ -312,11 +312,13 @@ private[spark] class Worker( case DriverState.ERROR => logWarning(s"Driver $driverId failed with unrecoverable exception: ${exception.get}") case DriverState.FAILED => - logWarning(s"Driver $driverId failed with state $state") + logWarning(s"Driver $driverId exited with failure") case DriverState.FINISHED => logInfo(s"Driver $driverId exited successfully") case DriverState.KILLED => logInfo(s"Driver $driverId was killed by user") + case _ => + logDebug(s"Driver $driverId changed state to $state") } masterLock.synchronized { master ! DriverStateChanged(driverId, state, exception)