Backward-compatible support

zsxwing · zsxwing · commit ff4664ceb6b9 · 2014-11-01T12:21:37.000+08:00
diff --git a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
@@ -639,8 +639,8 @@ private[spark] object JsonProtocol {
       case `taskResultLost` => TaskResultLost
       case `taskKilled` => TaskKilled
       case `executorLostFailure` =>
-        val executorId = (json \ "Executor ID").extract[String]
-        ExecutorLostFailure(executorId)
+        val executorId = Utils.jsonOption(json \ "Executor ID").map(_.extract[String])
+        ExecutorLostFailure(executorId.getOrElse("Unknown"))
       case `unknownReason` => UnknownReason
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -639,8 +639,8 @@ private[spark] object JsonProtocol {`
`639`	`639`	case `taskResultLost` => TaskResultLost
`640`	`640`	case `taskKilled` => TaskKilled
`641`	`641`	case `executorLostFailure` =>
`642`		`- val executorId = (json \ "Executor ID").extract[String]`
`643`		`- ExecutorLostFailure(executorId)`
	`642`	`+ val executorId = Utils.jsonOption(json \ "Executor ID").map(_.extract[String])`
	`643`	`+ ExecutorLostFailure(executorId.getOrElse("Unknown"))`
`644`	`644`	case `unknownReason` => UnknownReason
`645`	`645`	`}`
`646`	`646`	`}`