From 70d99f523c1993457e975bd48829766423e3861c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 11 Apr 2017 22:58:55 -0400 Subject: [PATCH] messages/MOSDPGQuery: remove compat cruft v3 was pre-firefly (8b46dd1dc009981f2fcae7b0e05155e81841c4a5). Signed-off-by: Sage Weil --- src/messages/MOSDPGQuery.h | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h index d6029d0d9f7..cc5db00ebae 100644 --- a/src/messages/MOSDPGQuery.h +++ b/src/messages/MOSDPGQuery.h @@ -25,8 +25,9 @@ class MOSDPGQuery : public Message { static const int HEAD_VERSION = 3; - static const int COMPAT_VERSION = 1; - version_t epoch; + static const int COMPAT_VERSION = 3; + + version_t epoch; public: version_t get_epoch() const { return epoch; } @@ -82,24 +83,14 @@ public: vector > _pg_list; ::decode(_pg_list, p); vector _shard_list(_pg_list.size(), shard_id_t::NO_SHARD); - if (header.version >= 3) { - _shard_list.clear(); - ::decode(_shard_list, p); - } + _shard_list.clear(); + ::decode(_shard_list, p); assert(_pg_list.size() == _shard_list.size()); for (unsigned i = 0; i < _pg_list.size(); ++i) { pg_list.insert( make_pair( spg_t(_pg_list[i].first, _shard_list[i]), _pg_list[i].second)); } - - if (header.version < 2) { - for (map::iterator i = pg_list.begin(); - i != pg_list.end(); - ++i) { - i->second.epoch_sent = epoch; - } - } } }; -- 2.39.5