Skip to content

Commit fd30838

Browse files
committed
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/trunk@1523885 13f79535-47bb-0310-9956-ffa450edef68
1 parent 4e6d0bb commit fd30838

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

hadoop-common-project/hadoop-common/CHANGES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,10 @@ Release 2.1.1-beta - UNRELEASED
367367

368368
INCOMPATIBLE CHANGES
369369

370+
HADOOP-9944. Fix RpcRequestHeaderProto.callId to be sint32 rather than
371+
uint32 since ipc.Client.CONNECTION_CONTEXT_CALL_ID is signed (i.e. -3)
372+
(acmurthy)
373+
370374
NEW FEATURES
371375

372376
IMPROVEMENTS

hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ message RequestHeaderProto {
6060
* ProtocolInfoProto) since they reuse the connection; in this case
6161
* the declaringClassProtocolName field is set to the ProtocolInfoProto
6262
*/
63-
required string declaringClassProtocolName = 3;
63+
required string declaringClassProtocolName = 2;
6464

6565
/** protocol version of class declaring the called method */
66-
required uint64 clientProtocolVersion = 4;
66+
required uint64 clientProtocolVersion = 3;
6767
}

hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ message RpcRequestHeaderProto { // the header for the RpcRequest
6262

6363
optional RpcKindProto rpcKind = 1;
6464
optional OperationProto rpcOp = 2;
65-
required uint32 callId = 3; // a sequence number that is sent back in response
65+
required sint32 callId = 3; // a sequence number that is sent back in response
6666
required bytes clientId = 4; // Globally unique client ID
6767
// clientId + callId uniquely identifies a request
6868
// retry count, 1 means this is the first retry

0 commit comments

Comments
 (0)