Author: acmurthy
Date: Tue Sep 17 04:54:07 2013
New Revision: 1523887
URL: http://svn.apache.org/r1523887
Log:
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.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1523887&r1=1523886&r2=1523887&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Sep 17 04:54:07 2013
@@ -4,6 +4,10 @@ Release 2.1.1-beta - UNRELEASED
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
IMPROVEMENTS
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto?rev=1523887&r1=1523886&r2=1523887&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto
Tue Sep 17 04:54:07 2013
@@ -60,8 +60,8 @@ message RequestHeaderProto {
* ProtocolInfoProto) since they reuse the connection; in this case
* the declaringClassProtocolName field is set to the ProtocolInfoProto
*/
- required string declaringClassProtocolName = 3;
+ required string declaringClassProtocolName = 2;
/** protocol version of class declaring the called method */
- required uint64 clientProtocolVersion = 4;
+ required uint64 clientProtocolVersion = 3;
}
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto?rev=1523887&r1=1523886&r2=1523887&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto
Tue Sep 17 04:54:07 2013
@@ -62,7 +62,7 @@ message RpcRequestHeaderProto { // the h
optional RpcKindProto rpcKind = 1;
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
// clientId + callId uniquely identifies a request
// retry count, 1 means this is the first retry
