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

HDFS-3949. NameNodeRpcServer#join should join on both client and server RPC servers. Contributed by Eli Collins 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1387838 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-09-20 01:33:13 +00:00
parent 8bf6b80f2b
commit d26f05b7f5
2 changed files with 7 additions and 1 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

@ -248,6 +248,9 @@ Release 2.0.3-alpha - Unreleased
HDFS-3951. datanode web ui does not work over HTTPS when datanode is started in secure mode. (tucu) HDFS-3951. datanode web ui does not work over HTTPS when datanode is started in secure mode. (tucu)
HDFS-3949. NameNodeRpcServer#join should join on both client and
server RPC servers. (eli)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
View File

@ -297,10 +297,13 @@ class NameNodeRpcServer implements NamenodeProtocols {
} }
/** /**
* Wait until the client RPC server has shutdown. * Wait until the RPC servers have shutdown.
*/ */
void join() throws InterruptedException { void join() throws InterruptedException {
clientRpcServer.join(); clientRpcServer.join();
if (serviceRpcServer != null) {
serviceRpcServer.join();
}
} }
/** /**