From d48957075591e0c308da79eaa5412ca8f6f73c8a Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Wed, 10 Feb 2016 15:26:08 -0800 Subject: [PATCH] HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto. (cherry picked from commit aeb13ef2ab657a1c2f9d9ed5f80783f788c4953a) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../hadoop-hdfs/src/main/proto/DatanodeProtocol.proto | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 3c952a1fb4a..5f09aca293e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1814,6 +1814,8 @@ Release 2.8.0 - UNRELEASED HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong rack value (Kuhu Shukla via umamahesh) + HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto. (wang) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto index 3c5e7edd438..a3b61398764 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto @@ -219,8 +219,8 @@ message HeartbeatResponseProto { repeated DatanodeCommandProto cmds = 1; // Returned commands can be null required NNHAStatusHeartbeatProto haStatus = 2; optional RollingUpgradeStatusProto rollingUpgradeStatus = 3; - optional uint64 fullBlockReportLeaseId = 4 [ default = 0 ]; - optional RollingUpgradeStatusProto rollingUpgradeStatusV2 = 5; + optional RollingUpgradeStatusProto rollingUpgradeStatusV2 = 4; + optional uint64 fullBlockReportLeaseId = 5 [ default = 0 ]; } /**