Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D30211908 for ; Wed, 17 Sep 2014 00:03:58 +0000 (UTC) Received: (qmail 52655 invoked by uid 500); 17 Sep 2014 00:03:57 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 52589 invoked by uid 500); 17 Sep 2014 00:03:57 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 52580 invoked by uid 99); 17 Sep 2014 00:03:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2014 00:03:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 43A9AA1764A; Wed, 17 Sep 2014 00:03:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <26979b42054947a2a93dd80662ba29c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. Contributed by Akira Ajisaka. Date: Wed, 17 Sep 2014 00:03:57 +0000 (UTC) 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 Authored: Tue Sep 16 17:02:06 2014 -0700 Committer: Andrew Wang 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();