Skip to content

Commit 786007c

Browse files
committed
Resolve empty path to root in liststatus
1 parent de3ca00 commit 786007c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,9 @@ public FileStatus[] listStatus(Path f) throws AccessControlException,
12021202
INodeLink<FileSystem> link = (INodeLink<FileSystem>) inode;
12031203
try {
12041204
String linkedPath = link.getTargetFileSystem().getUri().getPath();
1205+
if("".equals(linkedPath)) {
1206+
linkedPath = "/";
1207+
}
12051208
FileStatus status =
12061209
((ChRootedFileSystem)link.getTargetFileSystem())
12071210
.getMyFs().getFileStatus(new Path(linkedPath));

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemOverloadSchemeHdfsFileSystemContract.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ public void setUp() throws Exception {
7676
URI defaultFSURI =
7777
URI.create(conf.get(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY));
7878
ConfigUtil.addLink(conf, defaultFSURI.getAuthority(), "/user",
79-
new URI(defaultFSURI.toString() + "/user"));
79+
defaultFSURI);
8080
ConfigUtil.addLink(conf, defaultFSURI.getAuthority(), "/append",
81-
new URI(defaultFSURI.toString() + "/append"));
81+
defaultFSURI);
8282
ConfigUtil.addLink(conf, defaultFSURI.getAuthority(),
8383
"/FileSystemContractBaseTest/",
8484
new URI(defaultFSURI.toString() + "/FileSystemContractBaseTest/"));

0 commit comments

Comments
 (0)