Skip to content

[SPARK-22058][CORE]the BufferedInputStream will not be closed if an exception occurs. #19277

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
zuotingbing wants to merge 4 commits into from
Closed

[SPARK-22058][CORE]the BufferedInputStream will not be closed if an exception occurs. #19277

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff4c449
[SPARK-22058][CORE]the BufferedInputStream will not be closed if an e…
Sep 19, 2017
824856b
fix code review
Sep 19, 2017
e3f8e0d
handle Throwable
Sep 20, 2017
2e5f21a
fix Scala style checks
Sep 22, 2017
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
8 changes: 4 additions & 4 deletions core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,14 @@ private[spark] object EventLoggingListener extends Logging {
// Since we sanitize the app ID to not include periods, it is safe to split on it
val logName = log.getName.stripSuffix(IN_PROGRESS)
Copy link
Member

@srowen srowen Sep 20, 2017

Choose a reason for hiding this comment

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

Maybe move declaration of in to just before the try

val codecName: Option[String] = logName.split("\\.").tail.lastOption
val codec = codecName.map { c =>
codecMap.getOrElseUpdate(c, CompressionCodec.createCodec(new SparkConf, c))
}

try {
val codec = codecName.map { c =>
codecMap.getOrElseUpdate(c, CompressionCodec.createCodec(new SparkConf, c))
}
codec.map(_.compressedInputStream(in)).getOrElse(in)
Copy link
Contributor

@jerryshao jerryshao Sep 20, 2017

Choose a reason for hiding this comment

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

Is it better to move this line val in = new BufferedInputStream(fs.open(log)) to here to solve your problem?

} catch {
case e: Exception =>
case e: Throwable =>
Copy link
Contributor

@jiangxb1987 jiangxb1987 Sep 20, 2017

Choose a reason for hiding this comment

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

What specific case do we want to catch here?

Copy link
Author

@zuotingbing zuotingbing Sep 21, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

srowen 19 hours ago Member
I also note this doesn't handle Throwable, nor does a similar block earlier in the file. In case of say OutOfMemoryError it wouldn't be closed

with srowen's suggest, we could handle everything include exceptions and errors.

in.close()
throw e
}
Expand Down