You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ad...@apache.org on 2014/05/27 20:53:51 UTC
git commit: bugfix worker DriverStateChanged state should match
DriverState.FAILED
Repository: spark
Updated Branches:
refs/heads/master 549830b0d -> 95e4c9c6f
bugfix worker DriverStateChanged state should match DriverState.FAILED
bugfix worker DriverStateChanged state should match DriverState.FAILED
Author: lianhuiwang <li...@gmail.com>
Closes #864 from lianhuiwang/master and squashes the following commits:
480ce94 [lianhuiwang] address aarondav comments
f2b5970 [lianhuiwang] bugfix worker DriverStateChanged state should match DriverState.FAILED
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/95e4c9c6
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/95e4c9c6
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/95e4c9c6
Branch: refs/heads/master
Commit: 95e4c9c6fb153b7f0aa4c442c4bdb6552d326640
Parents: 549830b
Author: lianhuiwang <li...@gmail.com>
Authored: Tue May 27 11:53:38 2014 -0700
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Tue May 27 11:53:38 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/95e4c9c6/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 8b67479..100de26 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
@@ -317,10 +317,14 @@ 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 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)