HDFS-8939. Test(S)WebHdfsFileContextMainOperations failing on branch-2. Contributed by Chris Nauroth.
(cherry picked from commit 9871f57d41990b2763d4c23d9040aeb685b4a80f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c2d2c180 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c2d2c180 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c2d2c180 Branch: refs/heads/YARN-3926 Commit: c2d2c1802a11e3e11a953b23b0eccbf4d107de59 Parents: 53c38cc Author: Jakob Homan <[email protected]> Authored: Thu Sep 3 13:25:53 2015 -0700 Committer: Jakob Homan <[email protected]> Committed: Thu Sep 3 13:26:54 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/fs/SWebHdfs.java | 15 ++++++++++++++- .../src/main/java/org/apache/hadoop/fs/WebHdfs.java | 14 +++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c2d2c180/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index afc6cf4..42460ed 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/c2d2c180/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/SWebHdfs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/SWebHdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/SWebHdfs.java index cd36393..04b5880 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/SWebHdfs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/SWebHdfs.java @@ -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; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/c2d2c180/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/WebHdfs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/WebHdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/WebHdfs.java index dc4f6d5..d54a6b3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/WebHdfs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/WebHdfs.java @@ -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; } }
