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

svn merge -c 1171711 from trunk for HDFS-2337. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228694 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-01-07 18:24:25 +00:00
parent ab663fc96a
commit 302c9e0ef8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,8 @@ Release 0.23-PB - Unreleased
HDFS-2351 Change Namenode and Datanode to register each of their protocols seperately (Sanjay Radia) HDFS-2351 Change Namenode and Datanode to register each of their protocols seperately (Sanjay Radia)
HDFS-2337. DFSClient shouldn't keep multiple RPC proxy references (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/DFSClient.java
View File

@ -123,7 +123,6 @@ public class DFSClient implements java.io.Closeable {
public static final long SERVER_DEFAULTS_VALIDITY_PERIOD = 60 * 60 * 1000L; // 1 hour public static final long SERVER_DEFAULTS_VALIDITY_PERIOD = 60 * 60 * 1000L; // 1 hour
static final int TCP_WINDOW_SIZE = 128 * 1024; // 128 KB static final int TCP_WINDOW_SIZE = 128 * 1024; // 128 KB
final ClientProtocol namenode; final ClientProtocol namenode;
final ClientProtocol rpcNamenode;
private final InetSocketAddress nnAddress; private final InetSocketAddress nnAddress;
final UserGroupInformation ugi; final UserGroupInformation ugi;
volatile boolean clientRunning = true; volatile boolean clientRunning = true;
@ -291,11 +290,10 @@ public class DFSClient implements java.io.Closeable {
this.clientName = leaserenewer.getClientName(dfsClientConf.taskId); this.clientName = leaserenewer.getClientName(dfsClientConf.taskId);
this.socketCache = new SocketCache(dfsClientConf.socketCacheCapacity); this.socketCache = new SocketCache(dfsClientConf.socketCacheCapacity);
if (nameNodeAddr != null && rpcNamenode == null) { if (nameNodeAddr != null && rpcNamenode == null) {
this.rpcNamenode = DFSUtil.createRPCNamenode(nameNodeAddr, conf, ugi); this.namenode = DFSUtil.createNamenode(nameNodeAddr, conf);
this.namenode = DFSUtil.createNamenode(this.rpcNamenode);
} else if (nameNodeAddr == null && rpcNamenode != null) { } else if (nameNodeAddr == null && rpcNamenode != null) {
//This case is used for testing. //This case is used for testing.
this.namenode = this.rpcNamenode = rpcNamenode; this.namenode = rpcNamenode;
} else { } else {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Expecting exactly one of nameNodeAddr and rpcNamenode being null: " "Expecting exactly one of nameNodeAddr and rpcNamenode being null: "
@ -385,7 +383,7 @@ public class DFSClient implements java.io.Closeable {
void abort() { void abort() {
clientRunning = false; clientRunning = false;
closeAllFilesBeingWritten(true); closeAllFilesBeingWritten(true);
RPC.stopProxy(rpcNamenode); // close connections to the namenode RPC.stopProxy(namenode); // close connections to the namenode
} }
/** Close/abort all files being written. */ /** Close/abort all files being written. */
@ -425,7 +423,7 @@ public class DFSClient implements java.io.Closeable {
clientRunning = false; clientRunning = false;
leaserenewer.closeClient(this); leaserenewer.closeClient(this);
// close connections to the namenode // close connections to the namenode
RPC.stopProxy(rpcNamenode); RPC.stopProxy(namenode);
} }
} }