Repository: hadoop Updated Branches: refs/heads/branch-2 e533555b5 -> ac2ed09be
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/ac2ed09b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ac2ed09b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ac2ed09b Branch: refs/heads/branch-2 Commit: ac2ed09be7852c255b90d0f09a2aae468a0ba9e2 Parents: e533555 Author: Haohui Mai <[email protected]> Authored: Wed Sep 16 13:06:26 2015 -0700 Committer: Haohui Mai <[email protected]> Committed: Wed Sep 16 13:06:38 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/ac2ed09b/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ddbedab..f10a3bc 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -109,6 +109,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/ac2ed09b/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 dc78124..d35dfe0 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);
