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

HADOOP-14211. FilterFs and ChRootedFs are too aggressive about enforcing 'authorityNeeded'. Contributed by Erik Krogen. 

(cherry picked from commit 0e556a5ba6)
(cherry picked from commit 96fe940e59)
This commit is contained in:
Andrew Wang 2017-03-24 11:12:02 -07:00 committed by Zhe Zhang
parent a92f654aa2
commit 5130128a31
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
View File

@ -57,8 +57,7 @@ public abstract class FilterFs extends AbstractFileSystem {
} }
protected FilterFs(AbstractFileSystem fs) throws URISyntaxException { protected FilterFs(AbstractFileSystem fs) throws URISyntaxException {
super(fs.getUri(), fs.getUri().getScheme(), super(fs.getUri(), fs.getUri().getScheme(), false, fs.getUriDefaultPort());
fs.getUri().getAuthority() != null, fs.getUriDefaultPort());
myFs = fs; myFs = fs;
} }

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java
View File

@ -101,8 +101,7 @@ class ChRootedFs extends AbstractFileSystem {
public ChRootedFs(final AbstractFileSystem fs, final Path theRoot) public ChRootedFs(final AbstractFileSystem fs, final Path theRoot)
throws URISyntaxException { throws URISyntaxException {
super(fs.getUri(), fs.getUri().getScheme(), super(fs.getUri(), fs.getUri().getScheme(), false, fs.getUriDefaultPort());
fs.getUri().getAuthority() != null, fs.getUriDefaultPort());
myFs = fs; myFs = fs;
myFs.checkPath(theRoot); myFs.checkPath(theRoot);
chRootPathPart = new Path(myFs.getUriPath(theRoot)); chRootPathPart = new Path(myFs.getUriPath(theRoot));

12
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFs.java
View File

@ -25,6 +25,8 @@ import java.util.Iterator;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.viewfs.ConfigUtil;
public class TestFilterFs extends TestCase { public class TestFilterFs extends TestCase {
@ -65,4 +67,14 @@ public class TestFilterFs extends TestCase {
} }
} }
// Test that FilterFs will accept an AbstractFileSystem to be filtered which
// has an optional authority, such as ViewFs
public void testFilteringWithNonrequiredAuthority() throws Exception {
Configuration conf = new Configuration();
ConfigUtil.addLink(conf, "custom", "/mnt", URI.create("file:///"));
FileContext fc =
FileContext.getFileContext(URI.create("viewfs://custom/"), conf);
new FilterFs(fc.getDefaultFileSystem()) {};
}
} }