Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-16582. LocalFileSystem's mkdirs() does not work as expected under viewfs. Contributed by Kihwal Lee 

(cherry picked from commit d4205dce17)
This commit is contained in:
Kihwal Lee 2019-09-19 08:24:39 -05:00
parent 4299bc0d3e
commit 7477f8d2e9
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
View File

@ -332,6 +332,10 @@ public class FilterFileSystem extends FileSystem {
return fs.mkdirs(f, permission); return fs.mkdirs(f, permission);
} }
@Override
public boolean mkdirs(Path f) throws IOException {
return fs.mkdirs(f);
}
/** /**
* The src file is on the local disk. Add it to FS at * The src file is on the local disk. Add it to FS at

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
View File

@ -267,6 +267,11 @@ class ChRootedFileSystem extends FilterFileSystem {
return super.mkdirs(fullPath(f), permission); return super.mkdirs(fullPath(f), permission);
} }
@Override
public boolean mkdirs(final Path f) throws IOException {
return super.mkdirs(fullPath(f));
}
@Override @Override
public FSDataInputStream open(final Path f, final int bufferSize) public FSDataInputStream open(final Path f, final int bufferSize)
throws IOException { throws IOException {

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

@ -461,6 +461,13 @@ public class ViewFileSystem extends FileSystem {
suffix.length() == 0 ? f : new Path(res.resolvedPath, suffix)); suffix.length() == 0 ? f : new Path(res.resolvedPath, suffix));
} }
@Override
public boolean mkdirs(Path dir) throws IOException {
InodeTree.ResolveResult<FileSystem> res =
fsState.resolve(getUriPath(dir), false);
return res.targetFileSystem.mkdirs(res.remainingPath);
}
@Override @Override
public boolean mkdirs(final Path dir, final FsPermission permission) public boolean mkdirs(final Path dir, final FsPermission permission)
throws IOException { throws IOException {
@ -1076,6 +1083,12 @@ public class ViewFileSystem extends FileSystem {
throw readOnlyMountTable("mkdirs", dir); throw readOnlyMountTable("mkdirs", dir);
} }
@Override
public boolean mkdirs(Path dir)
throws AccessControlException, FileAlreadyExistsException {
return mkdirs(dir, null);
}
@Override @Override
public FSDataInputStream open(Path f, int bufferSize) public FSDataInputStream open(Path f, int bufferSize)
throws AccessControlException, FileNotFoundException, IOException { throws AccessControlException, FileNotFoundException, IOException {

1
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
View File

@ -78,7 +78,6 @@ public class TestFilterFileSystem {
boolean overwrite, int bufferSize, short replication, long blockSize, boolean overwrite, int bufferSize, short replication, long blockSize,
Progressable progress) throws IOException; Progressable progress) throws IOException;
public boolean mkdirs(Path f);
public FSDataInputStream open(Path f); public FSDataInputStream open(Path f);
public FSDataInputStream open(PathHandle f); public FSDataInputStream open(PathHandle f);
public FSDataOutputStream create(Path f); public FSDataOutputStream create(Path f);