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

HADOOP-9691. Merge r1501615 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505037 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-07-19 21:50:15 +00:00
parent 6c37a1584e
commit 8f3eba332d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -191,6 +191,9 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-9416. Add new symlink resolution methods in FileSystem and HADOOP-9416. Add new symlink resolution methods in FileSystem and
FileSystemLinkResolver. (Andrew Wang via Colin Patrick McCabe) FileSystemLinkResolver. (Andrew Wang via Colin Patrick McCabe)
HADOOP-9720. Rename Client#uuid to Client#clientId. (Arpit Agarwal via
suresh)
HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol,
RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol (jlowe) RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol (jlowe)

13
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
View File

@ -115,7 +115,7 @@ public class Client {
private final int connectionTimeout; private final int connectionTimeout;
private final boolean fallbackAllowed; private final boolean fallbackAllowed;
private final byte[] uuid; private final byte[] clientId;
final static int CONNECTION_CONTEXT_CALL_ID = -3; final static int CONNECTION_CONTEXT_CALL_ID = -3;
@ -841,9 +841,10 @@ public class Client {
RPC.getProtocolName(remoteId.getProtocol()), RPC.getProtocolName(remoteId.getProtocol()),
remoteId.getTicket(), remoteId.getTicket(),
authMethod); authMethod);
RpcRequestHeaderProto connectionContextHeader = RpcRequestHeaderProto connectionContextHeader = ProtoUtil
ProtoUtil.makeRpcRequestHeader(RpcKind.RPC_PROTOCOL_BUFFER, .makeRpcRequestHeader(RpcKind.RPC_PROTOCOL_BUFFER,
OperationProto.RPC_FINAL_PACKET, CONNECTION_CONTEXT_CALL_ID, uuid); OperationProto.RPC_FINAL_PACKET, CONNECTION_CONTEXT_CALL_ID,
clientId);
RpcRequestMessageWrapper request = RpcRequestMessageWrapper request =
new RpcRequestMessageWrapper(connectionContextHeader, message); new RpcRequestMessageWrapper(connectionContextHeader, message);
@ -951,7 +952,7 @@ public class Client {
// Items '1' and '2' are prepared here. // Items '1' and '2' are prepared here.
final DataOutputBuffer d = new DataOutputBuffer(); final DataOutputBuffer d = new DataOutputBuffer();
RpcRequestHeaderProto header = ProtoUtil.makeRpcRequestHeader( RpcRequestHeaderProto header = ProtoUtil.makeRpcRequestHeader(
call.rpcKind, OperationProto.RPC_FINAL_PACKET, call.id, uuid); call.rpcKind, OperationProto.RPC_FINAL_PACKET, call.id, clientId);
header.writeDelimitedTo(d); header.writeDelimitedTo(d);
call.rpcRequest.write(d); call.rpcRequest.write(d);
@ -1151,7 +1152,7 @@ public class Client {
CommonConfigurationKeys.IPC_CLIENT_CONNECT_TIMEOUT_DEFAULT); CommonConfigurationKeys.IPC_CLIENT_CONNECT_TIMEOUT_DEFAULT);
this.fallbackAllowed = conf.getBoolean(CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_KEY, this.fallbackAllowed = conf.getBoolean(CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_KEY,
CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_DEFAULT); CommonConfigurationKeys.IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH_ALLOWED_DEFAULT);
this.uuid = StringUtils.getUuidBytes(); this.clientId = StringUtils.getUuidBytes();
this.sendParamsExecutor = clientExcecutorFactory.refAndGetInstance(); this.sendParamsExecutor = clientExcecutorFactory.refAndGetInstance();
} }