svn merge -c 1173488
from trunk for HDFS-2351.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1228679 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
09b7f96ccc
commit
7f6f4f26d8
|
@ -9,6 +9,8 @@ Release 0.23-PB - Unreleased
|
|||
|
||||
HDFS-2223. Untangle depencencies between NN components (todd)
|
||||
|
||||
HDFS-2351 Change Namenode and Datanode to register each of their protocols seperately (Sanjay Radia)
|
||||
|
||||
Release 0.23.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -391,7 +391,7 @@ public class DataNode extends Configured
|
|||
private List<ServicePlugin> plugins;
|
||||
|
||||
// For InterDataNodeProtocol
|
||||
public Server ipcServer;
|
||||
public RPC.Server ipcServer;
|
||||
|
||||
private SecureResources secureResources = null;
|
||||
private AbstractList<File> dataDirs;
|
||||
|
@ -515,11 +515,15 @@ public class DataNode extends Configured
|
|||
private void initIpcServer(Configuration conf) throws IOException {
|
||||
InetSocketAddress ipcAddr = NetUtils.createSocketAddr(
|
||||
conf.get("dfs.datanode.ipc.address"));
|
||||
ipcServer = RPC.getServer(DataNode.class, this, ipcAddr.getHostName(),
|
||||
|
||||
// Add all the RPC protocols that the Datanode implements
|
||||
ipcServer = RPC.getServer(ClientDatanodeProtocol.class, this, ipcAddr.getHostName(),
|
||||
ipcAddr.getPort(),
|
||||
conf.getInt(DFS_DATANODE_HANDLER_COUNT_KEY,
|
||||
DFS_DATANODE_HANDLER_COUNT_DEFAULT),
|
||||
false, conf, blockPoolTokenSecretManager);
|
||||
ipcServer.addProtocol(InterDatanodeProtocol.class, this);
|
||||
|
||||
// set service-level authorization security policy
|
||||
if (conf.getBoolean(
|
||||
CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, false)) {
|
||||
|
|
|
@ -142,10 +142,17 @@ class NameNodeRpcServer implements NamenodeProtocols {
|
|||
serviceRpcServer = null;
|
||||
serviceRPCAddress = null;
|
||||
}
|
||||
this.server = RPC.getServer(NamenodeProtocols.class, this,
|
||||
// Add all the RPC protocols that the namenode implements
|
||||
this.server = RPC.getServer(ClientProtocol.class, this,
|
||||
socAddr.getHostName(), socAddr.getPort(),
|
||||
handlerCount, false, conf,
|
||||
namesystem.getDelegationTokenSecretManager());
|
||||
this.server.addProtocol(DatanodeProtocol.class, this);
|
||||
this.server.addProtocol(NamenodeProtocol.class, this);
|
||||
this.server.addProtocol(RefreshAuthorizationPolicyProtocol.class, this);
|
||||
this.server.addProtocol(RefreshUserMappingsProtocol.class, this);
|
||||
this.server.addProtocol(GetUserMappingsProtocol.class, this);
|
||||
|
||||
|
||||
// set service-level authorization security policy
|
||||
if (serviceAuthEnabled =
|
||||
|
|
Loading…
Reference in New Issue