Repository: spark Updated Branches: refs/heads/branch-1.3 2254576e1 -> bf4ca12f7
Revert "[SPARK-6314] [CORE] handle JsonParseException for history server" This reverts commit 37fb5a96812d9a8b2fb4b9492feb4c91f4f64f91. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bf4ca12f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bf4ca12f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bf4ca12f Branch: refs/heads/branch-1.3 Commit: bf4ca12f798558f027b15aad94c926258f80f4a9 Parents: 2254576 Author: Andrew Or <[email protected]> Authored: Wed Apr 29 12:24:52 2015 -0700 Committer: Andrew Or <[email protected]> Committed: Wed Apr 29 12:24:52 2015 -0700 ---------------------------------------------------------------------- .../org/apache/spark/deploy/history/FsHistoryProvider.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/bf4ca12f/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala b/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala index c55d258..554ce13 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala @@ -256,9 +256,8 @@ private[history] class FsHistoryProvider(conf: SparkConf) extends ApplicationHis } try { val appListener = new ApplicationEventListener - val appCompleted = isApplicationCompleted(eventLog) bus.addListener(appListener) - bus.replay(logInput, logPath.toString, !appCompleted) + bus.replay(logInput, logPath.toString) new FsApplicationHistoryInfo( logPath.getName(), appListener.appId.getOrElse(logPath.getName()), @@ -267,7 +266,7 @@ private[history] class FsHistoryProvider(conf: SparkConf) extends ApplicationHis appListener.endTime.getOrElse(-1L), getModificationTime(eventLog).get, appListener.sparkUser.getOrElse(NOT_STARTED), - appCompleted) + isApplicationCompleted(eventLog)) } finally { logInput.close() } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
