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

HDFS-2337. DFSClient shouldn't keep multiple RPC proxy references (atm) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1171711 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2011-09-16 18:38:32 +00:00
parent ff44372895
commit a89d4609b2
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

@ -29,6 +29,8 @@ Trunk (unreleased changes)
HDFS-2223. Untangle depencencies between NN components (todd) HDFS-2223. Untangle depencencies between NN components (todd)
HDFS-2337. DFSClient shouldn't keep multiple RPC proxy references (atm)
BUG FIXES BUG FIXES
HDFS-2287. TestParallelRead has a small off-by-one bug. (todd) HDFS-2287. TestParallelRead has a small off-by-one bug. (todd)

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

@ -114,7 +114,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;
final UserGroupInformation ugi; final UserGroupInformation ugi;
volatile boolean clientRunning = true; volatile boolean clientRunning = true;
private volatile FsServerDefaults serverDefaults; private volatile FsServerDefaults serverDefaults;
@ -253,11 +252,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: "
@ -340,7 +338,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. */
@ -380,7 +378,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);
} }
} }