From 6a68877f590ec20d2cc5e975638ec74079fed7c3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 31 May 2017 09:27:08 -0400 Subject: [PATCH] mon/PGMap: strip out PGMapDigest compat cruft This was needed for bigbang testing, but not for the final version. Signed-off-by: Sage Weil --- src/mon/PGMap.cc | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index ab3a639033feb..b10da306fb8e5 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -57,29 +57,13 @@ void PGMapDigest::decode(bufferlist::iterator& p) ::decode(pg_sum, p); ::decode(num_pg_by_state, p); ::decode(num_pg_by_osd, p); - if (struct_v >= 2) { - ::decode(osd_last_seq, p); - } else { - int s = 0; - for (auto& p : osd_stat) { - if (p.first >= s) { - s = p.first + 1; - } - } - osd_last_seq.resize(s); - } - if (struct_v >= 3) { - ::decode(num_pg_by_pool, p); - } - if (struct_v >= 4) { - ::decode(per_pool_sum_delta, p); - ::decode(per_pool_sum_deltas_stamps, p); - ::decode(pg_sum_delta, p); - ::decode(stamp_delta, p); - } - if (struct_v >= 5) { - ::decode(num_pg_unknown, p); - } + ::decode(osd_last_seq, p); + ::decode(num_pg_by_pool, p); + ::decode(per_pool_sum_delta, p); + ::decode(per_pool_sum_deltas_stamps, p); + ::decode(pg_sum_delta, p); + ::decode(stamp_delta, p); + ::decode(num_pg_unknown, p); DECODE_FINISH(p); } -- 2.39.5