Skip to content
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

[SPARK-24364][SS] Prevent InMemoryFileIndex from failing if file path doesn't exist #21408

Closed
wants to merge 3 commits into from
Closed

[SPARK-24364][SS] Prevent InMemoryFileIndex from failing if file path doesn't exist #21408

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c52d972
Prevent ListingFileCatalog from failing if file path doesn't exist
HyukjinKwon May 23, 2018
4d798e1
Fix error message format
HyukjinKwon May 24, 2018
a5614f8
Prettier
HyukjinKwon May 24, 2018
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
32 changes: 24 additions & 8 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/InMemoryFileIndex.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,12 @@ object InMemoryFileIndex extends Logging {
if (filter != null) allFiles.filter(f => filter.accept(f.getPath)) else allFiles
}

allLeafStatuses.filterNot(status => shouldFilterOut(status.getPath.getName)).map {
val missingFiles = mutable.ArrayBuffer.empty[String]
val filteredLeafStatuses = allLeafStatuses.filterNot(
status => shouldFilterOut(status.getPath.getName))
Copy link
Member Author

Choose a reason for hiding this comment

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

I made this var to reduce the diff.

val resolvedLeafStatuses = filteredLeafStatuses.flatMap {
case f: LocatedFileStatus =>
f
Some(f)

// NOTE:
//
Expand All @@ -311,14 +314,27 @@ object InMemoryFileIndex extends Logging {
// The other constructor of LocatedFileStatus will call FileStatus.getPermission(),
// which is very slow on some file system (RawLocalFileSystem, which is launch a
// subprocess and parse the stdout).
val locations = fs.getFileBlockLocations(f, 0, f.getLen)
val lfs = new LocatedFileStatus(f.getLen, f.isDirectory, f.getReplication, f.getBlockSize,
f.getModificationTime, 0, null, null, null, null, f.getPath, locations)
if (f.isSymlink) {
lfs.setSymlink(f.getSymlink)
try {
Copy link
Member Author

Choose a reason for hiding this comment

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

only diff here is try and catch

val locations = fs.getFileBlockLocations(f, 0, f.getLen)
val lfs = new LocatedFileStatus(f.getLen, f.isDirectory, f.getReplication, f.getBlockSize,
f.getModificationTime, 0, null, null, null, null, f.getPath, locations)
if (f.isSymlink) {
lfs.setSymlink(f.getSymlink)
}
Some(lfs)
} catch {
case _: FileNotFoundException =>
missingFiles += f.getPath.toString
None
}
lfs
}

if (missingFiles.nonEmpty) {
logWarning(s"The paths [${missingFiles.mkString(", ")}] were not found. " +
"Were they deleted very recently?")
Copy link
Member Author

@HyukjinKwon HyukjinKwon May 23, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

error message looks like this:

InMemoryFileIndex: The paths [hdfs://.../rel/00171151/input/hyukjin/part-43011-
fd2d682a-ade1-4b0d-9e52-ab5c5d895cc9-c000.csv, ... ] were not found. Were they deleted very recently?

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe

InMemoryFileIndex: the following files were missing during file scan:
path1
path2
...

Copy link
Member Author

Choose a reason for hiding this comment

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

no problem

Copy link
Member Author

Choose a reason for hiding this comment

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

Now the error messages should look like:

the following files were missing during file scan:
  hdfs://.../rel/00171151/input/hyukjin/part-43011-...
  hdfs://.../rel/00171151/input/hyukjin/part-43012-...
  hdfs://.../rel/00171151/input/hyukjin/part-43013-...
  ...

}

resolvedLeafStatuses
}

/** Checks if we should filter out this path name. */
Expand Down