Skip to content

[SPARK-20716][SS] StateStore.abort() should not throw exceptions #17958

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

[SPARK-20716][SS] StateStore.abort() should not throw exceptions #17958

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e36134
Ignored exceptions
tdas May 12, 2017
820e4d5
Fix mistake
tdas May 12, 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
22 changes: 16 additions & 6 deletions ...n/scala/org/apache/spark/sql/execution/streaming/state/HDFSBackedStateStoreProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.sql.execution.streaming.state

import java.io.{DataInputStream, DataOutputStream, FileNotFoundException, IOException}
import java.nio.channels.ClosedChannelException
import java.util.Locale

import scala.collection.JavaConverters._
Expand Down Expand Up @@ -202,13 +203,22 @@ private[state] class HDFSBackedStateStoreProvider(
/** Abort all the updates made on this store. This store will not be usable any more. */
override def abort(): Unit = {
verify(state == UPDATING || state == ABORTED, "Cannot abort after already committed")
try {
state = ABORTED
if (tempDeltaFileStream != null) {
tempDeltaFileStream.close()
}
if (tempDeltaFile != null) {
fs.delete(tempDeltaFile, true)
}
} catch {
case c: ClosedChannelException =>
Copy link
Member

@zsxwing zsxwing May 12, 2017

Choose a reason for hiding this comment

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

Why need two cases? The error message is same, and the exception is also in the log.

Copy link
Contributor

@marmbrus marmbrus May 12, 2017

Choose a reason for hiding this comment

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

Its debug though for the expected case.

Copy link
Member

@zsxwing zsxwing May 12, 2017

Choose a reason for hiding this comment

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

Maybe it should be a warning? In this case, the task will fail and it hurts nothing to output a warning but will be helpful when we have other issues.

Copy link
Member

@zsxwing zsxwing May 12, 2017

Choose a reason for hiding this comment

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

Gotcha!

// This can happen when underlying file output stream has been closed before the
// compression stream.
logDebug(s"Error aborting version $newVersion into $this", c)

state = ABORTED
if (tempDeltaFileStream != null) {
tempDeltaFileStream.close()
}
if (tempDeltaFile != null) {
fs.delete(tempDeltaFile, true)
case e: Exception =>
logWarning(s"Error aborting version $newVersion into $this", e)
}
logInfo(s"Aborted version $newVersion for $this")
}
Expand Down