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 E59AB18AFD for ; Fri, 18 Sep 2015 18:13:22 +0000 (UTC) Received: (qmail 33945 invoked by uid 500); 18 Sep 2015 18:13:21 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 33746 invoked by uid 500); 18 Sep 2015 18:13:21 -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 33421 invoked by uid 99); 18 Sep 2015 18:13:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Sep 2015 18:13:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30AEAE049D; Fri, 18 Sep 2015 18:13:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangda@apache.org To: common-commits@hadoop.apache.org Date: Fri, 18 Sep 2015 18:13:22 -0000 Message-Id: <53b8829e5bca41f79d9b32e719d212bd@git.apache.org> In-Reply-To: <51bb9abd63de4957b2788d6d3f5552d7@git.apache.org> References: <51bb9abd63de4957b2788d6d3f5552d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/34] hadoop git commit: MAPREDUCE-6477. Replace usage of deprecated NameNode.DEFAULT_PORT in TestFileSystem. Contributed by Mingliang Liu. MAPREDUCE-6477. Replace usage of deprecated NameNode.DEFAULT_PORT in TestFileSystem. Contributed by Mingliang Liu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/941001bf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/941001bf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/941001bf Branch: refs/heads/YARN-1197 Commit: 941001bfa63a2ed32b062aa639d72e76672952ee Parents: 07f3044 Author: Haohui Mai Authored: Wed Sep 16 13:06:26 2015 -0700 Committer: Haohui Mai Committed: Wed Sep 16 13:06:26 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/fs/TestFileSystem.java | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/941001bf/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index dd7a34a..669fee5 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -381,6 +381,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6443. Add JvmPauseMonitor to JobHistoryServer. (Robert Kanter via junping_du) + MAPREDUCE-6477. Replace usage of deprecated NameNode.DEFAULT_PORT in + TestFileSystem. (Mingliang Liu via wheat9) + OPTIMIZATIONS MAPREDUCE-6376. Add avro binary support for jhist files (Ray Chiang via http://git-wip-us.apache.org/repos/asf/hadoop/blob/941001bf/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java index 92441ab..4146b13 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java @@ -40,7 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.hadoop.hdfs.server.namenode.NameNode; +import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys; import org.apache.hadoop.fs.shell.CommandFormat; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.SequenceFile; @@ -510,10 +510,10 @@ public class TestFileSystem extends TestCase { { try { - runTestCache(NameNode.DEFAULT_PORT); + runTestCache(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT); } catch(java.net.BindException be) { - LOG.warn("Cannot test NameNode.DEFAULT_PORT (=" - + NameNode.DEFAULT_PORT + ")", be); + LOG.warn("Cannot test HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT (=" + + HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT + ")", be); } runTestCache(0); @@ -537,11 +537,11 @@ public class TestFileSystem extends TestCase { } } - if (port == NameNode.DEFAULT_PORT) { + if (port == HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT) { //test explicit default port URI uri2 = new URI(uri.getScheme(), uri.getUserInfo(), - uri.getHost(), NameNode.DEFAULT_PORT, uri.getPath(), - uri.getQuery(), uri.getFragment()); + uri.getHost(), HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT, + uri.getPath(), uri.getQuery(), uri.getFragment()); LOG.info("uri2=" + uri2); FileSystem fs = FileSystem.get(uri2, conf); checkPath(cluster, fs);