You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/01/26 00:39:24 UTC
spark git commit: Revert "[SPARK-5344][WebUI] HistoryServer cannot
recognize that inprogress file was renamed to completed file"
Repository: spark
Updated Branches:
refs/heads/branch-1.2 8f55beeb5 -> 2a2da4271
Revert "[SPARK-5344][WebUI] HistoryServer cannot recognize that inprogress file was renamed to completed file"
This reverts commit 8f55beeb51e6ea72e63af3f276497f61dd24d09b.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2a2da427
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2a2da427
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2a2da427
Branch: refs/heads/branch-1.2
Commit: 2a2da4271eebbbddd33c248a2fd619f388c9fb27
Parents: 8f55bee
Author: Andrew Or <an...@databricks.com>
Authored: Sun Jan 25 15:39:18 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Sun Jan 25 15:39:18 2015 -0800
----------------------------------------------------------------------
.../org/apache/spark/deploy/history/FsHistoryProvider.scala | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2a2da427/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 4671ca2..82a54db 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
@@ -197,9 +197,7 @@ private[history] class FsHistoryProvider(conf: SparkConf) extends ApplicationHis
if (!logInfos.isEmpty) {
val newApps = new mutable.LinkedHashMap[String, FsApplicationHistoryInfo]()
def addIfAbsent(info: FsApplicationHistoryInfo) = {
- if (!newApps.contains(info.id) ||
- newApps(info.id).logPath.endsWith(EventLoggingListener.IN_PROGRESS) &&
- !info.logPath.endsWith(EventLoggingListener.IN_PROGRESS)) {
+ if (!newApps.contains(info.id)) {
newApps += (info.id -> info)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org