瀏覽代碼

HADOOP-10148. backport hadoop-10107 to branch-0.23 (Chen He via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1549648 13f79535-47bb-0310-9956-ffa450edef68
Jonathan Turner Eagles 11 年之前
父節點
當前提交
8cb3b01db9

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -8,6 +8,8 @@ Release 0.23.11 - UNRELEASED
     
     
   IMPROVEMENTS
   IMPROVEMENTS
 
 
+    HADOOP-10148. backport hadoop-10107 to branch-0.23 (Chen He via jeagles)
+
   OPTIMIZATIONS
   OPTIMIZATIONS
     
     
   BUG FIXES
   BUG FIXES

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java

@@ -1600,6 +1600,7 @@ public abstract class Server {
     // Start the listener here and let it bind to the port
     // Start the listener here and let it bind to the port
     listener = new Listener();
     listener = new Listener();
     this.port = listener.getAddress().getPort();    
     this.port = listener.getAddress().getPort();    
+    connectionManager = new ConnectionManager();
     this.rpcMetrics = RpcMetrics.create(this);
     this.rpcMetrics = RpcMetrics.create(this);
     this.rpcDetailedMetrics = RpcDetailedMetrics.create(this.port);
     this.rpcDetailedMetrics = RpcDetailedMetrics.create(this.port);
     this.tcpNoDelay = conf.getBoolean(
     this.tcpNoDelay = conf.getBoolean(
@@ -1608,7 +1609,6 @@ public abstract class Server {
 
 
     // Create the responder here
     // Create the responder here
     responder = new Responder();
     responder = new Responder();
-    connectionManager = new ConnectionManager();
     
     
     if (isSecurityEnabled) {
     if (isSecurityEnabled) {
       SaslRpcServer.init(conf);
       SaslRpcServer.init(conf);