Repository: hadoop Updated Branches: refs/heads/branch-2 23f34b75e -> fcd181bde
HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. Contributed by Akira Ajisaka. (cherry picked from commit a044407b5c3a2914a055812cb570218f69edae9b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fcd181bd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fcd181bd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fcd181bd Branch: refs/heads/branch-2 Commit: fcd181bde19f4b690880b60da6438e6a2bab4bdc Parents: 23f34b7 Author: Andrew Wang <w...@apache.org> Authored: Tue Sep 16 17:02:06 2014 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Tue Sep 16 17:03:52 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++ .../test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd181bd/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 5733f52..c9bc8bc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -405,6 +405,10 @@ Release 2.6.0 - UNRELEASED HDFS-6965. NN continues to issue block locations for DNs with full disks. (Rushabh Shah via kihwal) + HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI + and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. + (Akira Ajisaka via wang) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HDFS-6387. HDFS CLI admin tool for creating & deleting an http://git-wip-us.apache.org/repos/asf/hadoop/blob/fcd181bd/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java index d33d756..5f136a9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java @@ -257,9 +257,8 @@ public class TestDFSClientFailover { */ @Test public void testDoesntDnsResolveLogicalURI() throws Exception { - NameService spyNS = spyOnNameService(); - FileSystem fs = HATestUtil.configureFailoverFs(cluster, conf); + NameService spyNS = spyOnNameService(); String logicalHost = fs.getUri().getHost(); Path qualifiedRoot = fs.makeQualified(new Path("/")); @@ -276,8 +275,8 @@ public class TestDFSClientFailover { */ @Test public void testFileContextDoesntDnsResolveLogicalURI() throws Exception { - NameService spyNS = spyOnNameService(); FileSystem fs = HATestUtil.configureFailoverFs(cluster, conf); + NameService spyNS = spyOnNameService(); String logicalHost = fs.getUri().getHost(); Configuration haClientConf = fs.getConf();
