From 429e03d6f9946656098befdec316513e4d7cc99e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Apr 2017 07:59:42 -0400 Subject: [PATCH] messages/MOSDRepScrub: remove compat cruft v6 was 7d73f41f0d6ae2bf971c72b0b8aca6579e1c0d62 (pre-hammer). Signed-off-by: Sage Weil --- src/messages/MOSDRepScrub.h | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h index a1134bac39d1..2f125e695915 100644 --- a/src/messages/MOSDRepScrub.h +++ b/src/messages/MOSDRepScrub.h @@ -25,7 +25,7 @@ struct MOSDRepScrub : public MOSDFastDispatchOp { static const int HEAD_VERSION = 6; - static const int COMPAT_VERSION = 2; + static const int COMPAT_VERSION = 6; spg_t pgid; // PG to scrub eversion_t scrub_from; // only scrub log entries after scrub_from @@ -97,31 +97,12 @@ public: ::decode(scrub_from, p); ::decode(scrub_to, p); ::decode(map_epoch, p); - - if (header.version >= 3) { - ::decode(chunky, p); - ::decode(start, p); - ::decode(end, p); - if (header.version >= 4) { - ::decode(deep, p); - } else { - deep = false; - } - } else { // v2 scrub: non-chunky - chunky = false; - deep = false; - } - - if (header.version >= 5) { - ::decode(pgid.shard, p); - } else { - pgid.shard = shard_id_t::NO_SHARD; - } - if (header.version >= 6) { - ::decode(seed, p); - } else { - seed = 0; - } + ::decode(chunky, p); + ::decode(start, p); + ::decode(end, p); + ::decode(deep, p); + ::decode(pgid.shard, p); + ::decode(seed, p); } }; -- 2.47.3