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

Merge -c 1523885 from trunk to branch-2 to fix HADOOP-9944. Fix RpcRequestHeaderProto.callId to be sint32 rather than uint32 since ipc.Client.CONNECTION_CONTEXT_CALL_ID is signed (i.e. -3). Contributed by Arun C. Murthy. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523886 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2013-09-17 04:54:04 +00:00
parent d03b60c61a
commit 1d6a45a02c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,10 @@ Release 2.1.1-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES
HADOOP-9944. Fix RpcRequestHeaderProto.callId to be sint32 rather than
uint32 since ipc.Client.CONNECTION_CONTEXT_CALL_ID is signed (i.e. -3)
(acmurthy)
NEW FEATURES NEW FEATURES
IMPROVEMENTS IMPROVEMENTS

4
hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto
View File

@ -60,8 +60,8 @@ message RequestHeaderProto {
* ProtocolInfoProto) since they reuse the connection; in this case * ProtocolInfoProto) since they reuse the connection; in this case
* the declaringClassProtocolName field is set to the ProtocolInfoProto * the declaringClassProtocolName field is set to the ProtocolInfoProto
*/ */
required string declaringClassProtocolName = 3; required string declaringClassProtocolName = 2;
/** protocol version of class declaring the called method */ /** protocol version of class declaring the called method */
required uint64 clientProtocolVersion = 4; required uint64 clientProtocolVersion = 3;
} }

2
hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
View File

@ -62,7 +62,7 @@ message RpcRequestHeaderProto { // the header for the RpcRequest
optional RpcKindProto rpcKind = 1; optional RpcKindProto rpcKind = 1;
optional OperationProto rpcOp = 2; optional OperationProto rpcOp = 2;
required uint32 callId = 3; // a sequence number that is sent back in response required sint32 callId = 3; // a sequence number that is sent back in response
required bytes clientId = 4; // Globally unique client ID required bytes clientId = 4; // Globally unique client ID
// clientId + callId uniquely identifies a request // clientId + callId uniquely identifies a request
// retry count, 1 means this is the first retry // retry count, 1 means this is the first retry