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)
(cherry picked from commit 5130128a31)
This commit is contained in:
Andrew Wang 2017-03-24 11:12:02 -07:00 committed by Zhe Zhang
parent 4cc53b51f6
commit 295aab8e3a
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -123,6 +123,9 @@ Release 2.7.4 - UNRELEASED
HADOOP-9631. ViewFs should use underlying FileSystem's server side defaults.
(Lohit Vijayarenu and Erik Krogen via zhz)
HADOOP-14211. FilterFs and ChRootedFs are too aggressive about enforcing
"authorityNeeded". (Erik Krogen via wang)
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES

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

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

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

@ -99,8 +99,7 @@ class ChRootedFs extends AbstractFileSystem {
public ChRootedFs(final AbstractFileSystem fs, final Path theRoot)
throws URISyntaxException {
super(fs.getUri(), fs.getUri().getScheme(),
fs.getUri().getAuthority() != null, fs.getUriDefaultPort());
super(fs.getUri(), fs.getUri().getScheme(), false, fs.getUriDefaultPort());
myFs = fs;
myFs.checkPath(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 org.apache.commons.logging.Log;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.viewfs.ConfigUtil;
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()) {};
}
}