From 58f45a25a891cb984061d30bdf7e5780bd165c85 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Apr 2017 08:01:15 -0400 Subject: [PATCH] messages/MRecoveryReserve: remove compat cruft v2 was 9013efd3a3cf92d1ec8e2a39639214792067d0d2 (pre-firefly). Signed-off-by: Sage Weil --- src/messages/MRecoveryReserve.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/messages/MRecoveryReserve.h b/src/messages/MRecoveryReserve.h index c0e975004d84..82bfe868940f 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 { -- 2.47.3