From 1d6a45a02c408e85f0dea955e48d1e9cdf673471 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Tue, 17 Sep 2013 04:54:04 +0000 Subject: [PATCH] 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 --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++ .../hadoop-common/src/main/proto/ProtobufRpcEngine.proto | 4 ++-- .../hadoop-common/src/main/proto/RpcHeader.proto | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0ff834dcb5d..811551279f7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -86,6 +86,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 diff --git a/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto b/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto index 7923e8ba710..a17e2078e94 100644 --- a/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto +++ b/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto @@ -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; } diff --git a/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto b/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto index 673883b23a5..e8c4adac367 100644 --- a/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto +++ b/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto @@ -62,7 +62,7 @@ message RpcRequestHeaderProto { // the header for the RpcRequest 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