Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1196171 from trunk for HDFS-2526. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229907 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-01-11 06:55:10 +00:00
parent 53973db61b
commit 3cf4430876
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -42,6 +42,9 @@ Release 0.23-PB - Unreleased
HDFS-2499. RPC client is created incorrectly introduced in HDFS-2459. HDFS-2499. RPC client is created incorrectly introduced in HDFS-2459.
(suresh) (suresh)
HDFS-2526. (Client)NamenodeProtocolTranslatorR23 do not need to keep a
reference to rpcProxyWithoutRetry (atm)
Release 0.23.1 - UNRELEASED Release 0.23.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolR23Compatible/ClientNamenodeProtocolTranslatorR23.java
View File

@ -79,7 +79,6 @@ import org.apache.hadoop.hdfs.protocol.HdfsConstants;
@InterfaceStability.Stable @InterfaceStability.Stable
public class ClientNamenodeProtocolTranslatorR23 implements public class ClientNamenodeProtocolTranslatorR23 implements
ClientProtocol, Closeable { ClientProtocol, Closeable {
final private ClientNamenodeWireProtocol rpcProxyWithoutRetry;
final private ClientNamenodeWireProtocol rpcProxy; final private ClientNamenodeWireProtocol rpcProxy;
private static ClientNamenodeWireProtocol createNamenode( private static ClientNamenodeWireProtocol createNamenode(
@ -118,16 +117,11 @@ public class ClientNamenodeProtocolTranslatorR23 implements
public ClientNamenodeProtocolTranslatorR23(InetSocketAddress nameNodeAddr, public ClientNamenodeProtocolTranslatorR23(InetSocketAddress nameNodeAddr,
Configuration conf, UserGroupInformation ugi) throws IOException { Configuration conf, UserGroupInformation ugi) throws IOException {
rpcProxyWithoutRetry = createNamenode(nameNodeAddr, conf, ugi); rpcProxy = createNamenodeWithRetry(createNamenode(nameNodeAddr, conf, ugi));
rpcProxy = createNamenodeWithRetry(rpcProxyWithoutRetry);
}
public Object getProxyWithoutRetry() {
return rpcProxyWithoutRetry;
} }
public void close() { public void close() {
RPC.stopProxy(rpcProxyWithoutRetry); RPC.stopProxy(rpcProxy);
} }
@Override @Override

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolR23Compatible/NamenodeProtocolTranslatorR23.java
View File

@ -57,7 +57,6 @@ import org.apache.hadoop.security.UserGroupInformation;
@InterfaceStability.Stable @InterfaceStability.Stable
public class NamenodeProtocolTranslatorR23 implements public class NamenodeProtocolTranslatorR23 implements
NamenodeProtocol, Closeable { NamenodeProtocol, Closeable {
final private NamenodeWireProtocol rpcProxyWithoutRetry;
final private NamenodeWireProtocol rpcProxy; final private NamenodeWireProtocol rpcProxy;
private static NamenodeWireProtocol createNamenode( private static NamenodeWireProtocol createNamenode(
@ -97,16 +96,11 @@ public class NamenodeProtocolTranslatorR23 implements
public NamenodeProtocolTranslatorR23(InetSocketAddress nameNodeAddr, public NamenodeProtocolTranslatorR23(InetSocketAddress nameNodeAddr,
Configuration conf, UserGroupInformation ugi) throws IOException { Configuration conf, UserGroupInformation ugi) throws IOException {
rpcProxyWithoutRetry = createNamenode(nameNodeAddr, conf, ugi); rpcProxy = createNamenodeWithRetry(createNamenode(nameNodeAddr, conf, ugi));
rpcProxy = createNamenodeWithRetry(rpcProxyWithoutRetry);
}
public Object getProxyWithoutRetry() {
return rpcProxyWithoutRetry;
} }
public void close() { public void close() {
RPC.stopProxy(rpcProxyWithoutRetry); RPC.stopProxy(rpcProxy);
} }
@Override @Override