From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Apr 2017 12:01:15 +0000 (-0400)
Subject: messages/MRecoveryReserve: remove compat cruft
X-Git-Tag: v12.0.3~190^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=58f45a25a891cb984061d30bdf7e5780bd165c85;p=ceph-ci.git

messages/MRecoveryReserve: remove compat cruft

v2 was 9013efd3a3cf92d1ec8e2a39639214792067d0d2 (pre-firefly).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/messages/MRecoveryReserve.h b/src/messages/MRecoveryReserve.h
index c0e975004d8..82bfe868940 100644
--- a/src/messages/MRecoveryReserve.h
+++ b/src/messages/MRecoveryReserve.h
@@ -19,7 +19,7 @@
 
 class MRecoveryReserve : public Message {
   static const int HEAD_VERSION = 2;
-  static const int COMPAT_VERSION = 1;
+  static const int COMPAT_VERSION = 2;
 public:
   spg_t pgid;
   epoch_t query_epoch;
@@ -66,10 +66,7 @@ public:
     ::decode(pgid.pgid, p);
     ::decode(query_epoch, p);
     ::decode(type, p);
-    if (header.version >= 2)
-      ::decode(pgid.shard, p);
-    else
-      pgid.shard = shard_id_t::NO_SHARD;
+    ::decode(pgid.shard, p);
   }
 
   void encode_payload(uint64_t features) override {