Skip to content

[SPARK-32529][CORE] Fix Historyserver log scan aborted by application status change #29350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yanxiaole wants to merge 3 commits into from
Closed

[SPARK-32529][CORE] Fix Historyserver log scan aborted by application status change #29350

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3f7a6c
[SPARK-32529][CORE] Fix Historyserver log scan aborted by application…
yanxiaole Aug 4, 2020
d113709
[SPARK-32529][CORE] add more catch blocks
yanxiaole Aug 5, 2020
d1bf4ca
[SPARK-32529][CORE] add an empty new line after `}`
yanxiaole Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,10 +530,17 @@ private[history] class FsHistoryProvider(conf: SparkConf, clock: Clock)
// If the file is currently not being tracked by the SHS, add an entry for it and try
// to parse it. This will allow the cleaner code to detect the file as stale later on
// if it was not possible to parse it.
listing.write(LogInfo(reader.rootPath.toString(), newLastScanTime, LogType.EventLogs,
None, None, reader.fileSizeForLastIndex, reader.lastIndex, None,
reader.completed))
reader.fileSizeForLastIndex > 0
try {
listing.write(LogInfo(reader.rootPath.toString(), newLastScanTime,
LogType.EventLogs, None, None, reader.fileSizeForLastIndex, reader.lastIndex,
None, reader.completed))
reader.fileSizeForLastIndex > 0
} catch {
case _: FileNotFoundException => false
}

case _: FileNotFoundException =>
Copy link
Contributor

@HeartSaVioR HeartSaVioR Aug 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I'd have empty new line after }.

Copy link
Contributor Author

@yanxiaole yanxiaole Aug 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

nit: I'd have empty new line after }.

false
}
}
.sortWith { case (entry1, entry2) =>
Expand Down