From 50335922f7d2671a957966bdb1c1b8344477f5a5 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Tue, 7 Feb 2012 21:04:23 +0000 Subject: [PATCH] svn merge -c 1241253 from trunk for MAPREDUCE-3818. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1241625 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 5 +++++ .../org/apache/hadoop/mapred/TestSubmitJob.java | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 7faa1d67057..70a64225930 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -21,6 +21,11 @@ Release 0.23-PB - Unreleased MAPREDUCE-3740. Fixed broken mapreduce compilation after the patch for HADOOP-7965. (Devaraj K via vinodkv) + BUG FIXES + + MAPREDUCE-3818. Fixed broken compilation in TestSubmitJob after the patch + for HDFS-2895. (Suresh Srinivas via vinodkv) + Release 0.23.1 - Unreleased NEW FEATURES diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSubmitJob.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSubmitJob.java index 3478bd30f5e..98563d56a01 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSubmitJob.java +++ b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSubmitJob.java @@ -33,6 +33,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; +import org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolTranslatorPB; import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.ipc.RemoteException; @@ -148,15 +149,9 @@ public class TestSubmitJob { } static org.apache.hadoop.hdfs.protocol.ClientProtocol getDFSClient( - Configuration conf, UserGroupInformation ugi) - throws IOException { - return (org.apache.hadoop.hdfs.protocol.ClientProtocol) - RPC.getProxy(org.apache.hadoop.hdfs.protocol.ClientProtocol.class, - org.apache.hadoop.hdfs.protocol.ClientProtocol.versionID, - NameNode.getAddress(conf), ugi, - conf, - NetUtils.getSocketFactory(conf, - org.apache.hadoop.hdfs.protocol.ClientProtocol.class)); + Configuration conf, UserGroupInformation ugi) throws IOException { + return new ClientNamenodeProtocolTranslatorPB(NameNode.getAddress(conf), + conf, ugi); } /**