HADOOP-15748. S3 listing inconsistency can raise NPE in globber. Contributed by Steve Loughran.
(cherry picked from commit 646874c326139457b79cf8cfa547b3c91a78c7b4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5b779915 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5b779915 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5b779915 Branch: refs/heads/branch-2 Commit: 5b77991548c8d1b01ff6b32c17c7f4b6a852fff9 Parents: 0dd6861 Author: Steve Loughran <ste...@apache.org> Authored: Thu Sep 20 13:07:07 2018 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Sep 20 13:07:07 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/Globber.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b779915/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java index ca3db1d..b241a94 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Globber.java @@ -245,7 +245,18 @@ class Globber { // incorrectly conclude that /a/b was a file and should not match // /a/*/*. So we use getFileStatus of the path we just listed to // disambiguate. - if (!getFileStatus(candidate.getPath()).isDirectory()) { + Path path = candidate.getPath(); + FileStatus status = getFileStatus(path); + if (status == null) { + // null means the file was not found + LOG.warn("File/directory {} not found:" + + " it may have been deleted." + + " If this is an object store, this can be a sign of" + + " eventual consistency problems.", + path); + continue; + } + if (!status.isDirectory()) { continue; } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
