Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/2471#discussion_r18740457
--- Diff:
core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala ---
@@ -195,22 +241,68 @@ private[history] class FsHistoryProvider(conf:
SparkConf) extends ApplicationHis
}
}
- val newIterator = logInfos.iterator.buffered
- val oldIterator = applications.values.iterator.buffered
- while (newIterator.hasNext && oldIterator.hasNext) {
- if (newIterator.head.endTime > oldIterator.head.endTime) {
- addIfAbsent(newIterator.next)
- } else {
- addIfAbsent(oldIterator.next)
+ applications.synchronized {
+ val newIterator = logInfos.iterator.buffered
+ val oldIterator = applications.values.iterator.buffered
+ while (newIterator.hasNext && oldIterator.hasNext) {
+ if (newIterator.head.endTime > oldIterator.head.endTime) {
+ addIfAbsent(newIterator.next)
+ } else {
+ addIfAbsent(oldIterator.next)
+ }
}
+ newIterator.foreach(addIfAbsent)
+ oldIterator.foreach(addIfAbsent)
+
+ applications = newApps
}
- newIterator.foreach(addIfAbsent)
- oldIterator.foreach(addIfAbsent)
+ }
+ } catch {
+ case t: Throwable => logError("Exception in checking for event log
updates", t)
+ }
+ }
+
+ /**
+ * Deleting apps if setting cleaner.
+ */
+ private def cleanLogs() = {
+ lastLogCleanTimeMs = getMonotonicTimeMs()
+ logDebug("Cleaning logs. Time is now %d.".format(lastLogCleanTimeMs))
--- End diff --
Nit: string interpolation is probably clearer: `s:"Cleaning ... now
$lastLogCleanTimeMs"`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
