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

HDFS-8939. Test(S)WebHdfsFileContextMainOperations failing on branch-2. Contributed by Chris Nauroth. 

(cherry picked from commit 9871f57d41)
This commit is contained in:
Jakob Homan 2015-09-03 13:25:53 -07:00
parent 53c38cc89a
commit c2d2c1802a
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1292,6 +1292,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8964. When validating the edit log, do not read at or beyond the file
offset that is being written (Zhe Zhang via Colin P. McCabe)
HDFS-8939. Test(S)WebHdfsFileContextMainOperations failing on branch-2.
(Chris Nauroth via jghoman)
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES

15
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/SWebHdfs.java
View File

@ -46,6 +46,19 @@ public class SWebHdfs extends DelegateToFileSystem {
*/
SWebHdfs(URI theUri, Configuration conf)
throws IOException, URISyntaxException {
super(theUri, new SWebHdfsFileSystem(), conf, SCHEME, false);
super(theUri, createSWebHdfsFileSystem(conf), conf, SCHEME, false);
}
/**
* Returns a new {@link SWebHdfsFileSystem}, with the given configuration.
*
* @param conf configuration
* @return new SWebHdfsFileSystem
*/
private static SWebHdfsFileSystem createSWebHdfsFileSystem(
Configuration conf) {
SWebHdfsFileSystem fs = new SWebHdfsFileSystem();
fs.setConf(conf);
return fs;
}
}

14
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/WebHdfs.java
View File

@ -46,6 +46,18 @@ public class WebHdfs extends DelegateToFileSystem {
*/
WebHdfs(URI theUri, Configuration conf)
throws IOException, URISyntaxException {
super(theUri, new WebHdfsFileSystem(), conf, SCHEME, false);
super(theUri, createWebHdfsFileSystem(conf), conf, SCHEME, false);
}
/**
* Returns a new {@link WebHdfsFileSystem}, with the given configuration.
*
* @param conf configuration
* @return new WebHdfsFileSystem
*/
private static WebHdfsFileSystem createWebHdfsFileSystem(Configuration conf) {
WebHdfsFileSystem fs = new WebHdfsFileSystem();
fs.setConf(conf);
return fs;
}
}