You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by li...@apache.org on 2016/11/30 21:08:20 UTC
[3/3] hadoop git commit: HADOOP-13830. Intermittent failure of
ITestS3NContractRootDir#testRecursiveRootListing: "Can not create a Path from
an empty string". Contributed by Steve Loughran
HADOOP-13830. Intermittent failure of ITestS3NContractRootDir#testRecursiveRootListing: "Can not create a Path from an empty string". Contributed by Steve Loughran
(cherry picked from commit 3fd844b99fdfae6be6e5e261f371d175aad14229)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/afad13f8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/afad13f8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/afad13f8
Branch: refs/heads/branch-2.8
Commit: afad13f8d9ee75c38c1c836b3b5fd471e629d94e
Parents: 7f4bd1a
Author: Mingliang Liu <li...@apache.org>
Authored: Wed Nov 30 13:01:02 2016 -0800
Committer: Mingliang Liu <li...@apache.org>
Committed: Wed Nov 30 13:06:22 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/fs/s3native/NativeS3FileSystem.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/afad13f8/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
index 9ae1061..e4e6037 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
@@ -574,7 +574,12 @@ public class NativeS3FileSystem extends FileSystem {
for (String commonPrefix : listing.getCommonPrefixes()) {
Path subpath = keyToPath(commonPrefix);
String relativePath = pathUri.relativize(subpath.toUri()).getPath();
- status.add(newDirectory(new Path(absolutePath, relativePath)));
+ // sometimes the common prefix includes the base dir (HADOOP-13830).
+ // avoid that problem by detecting it and keeping it out
+ // of the list
+ if (!relativePath.isEmpty()) {
+ status.add(newDirectory(new Path(absolutePath, relativePath)));
+ }
}
priorLastKey = listing.getPriorLastKey();
} while (priorLastKey != null);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org