Skip to content

[SPARK-48991][SQL] Move path initialization into try-catch block in FileStreamSink.hasMetadata #47471

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 1 commit into from
Closed

[SPARK-48991][SQL] Move path initialization into try-catch block in FileStreamSink.hasMetadata #47471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/FileStreamSink.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ object FileStreamSink extends Logging {

path match {
case Seq(singlePath) =>
val hdfsPath = new Path(singlePath)
try {
val hdfsPath = new Path(singlePath)
val fs = hdfsPath.getFileSystem(hadoopConf)
if (fs.getFileStatus(hdfsPath).isDirectory) {
val metadataPath = getMetadataLogPath(fs, hdfsPath, sqlConf)
Expand Down
13 changes: 13 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSinkSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,19 @@ abstract class FileStreamSinkSuite extends StreamTest {
}
}
}

test("SPARK-48991: Move path initialization into try-catch block") {
val logAppender = new LogAppender("Assume no metadata directory.")
Seq(null, "", "file:tmp").foreach { path =>
withLogAppender(logAppender) {
assert(!FileStreamSink.hasMetadata(Seq(path), spark.sessionState.newHadoopConf(), conf))
}

assert(logAppender.loggingEvents.map(_.getMessage.getFormattedMessage).contains(
"Assume no metadata directory. Error while looking for metadata directory in the path:" +
s" $path."))
}
}
}

object PendingCommitFilesTrackingManifestFileCommitProtocol {
Expand Down