From a044407b5c3a2914a055812cb570218f69edae9b Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Tue, 16 Sep 2014 17:02:06 -0700 Subject: [PATCH] HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. Contributed by Akira Ajisaka. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++ .../java/org/apache/hadoop/hdfs/TestDFSClientFailover.java | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 6ee7043361f..752e77869ca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -663,6 +663,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 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 d33d7562cf6..5f136a9e2a2 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();