From de918ea1249551973463ee7e3ca4b202c24e09aa Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 24 Aug 2017 12:43:36 -0400 Subject: [PATCH] messages/MOSDPGRemove: drop pre-luminous compat Signed-off-by: Sage Weil --- src/messages/MOSDPGRemove.h | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h index f692ad428c361..026befc48fbfd 100644 --- a/src/messages/MOSDPGRemove.h +++ b/src/messages/MOSDPGRemove.h @@ -23,7 +23,7 @@ class MOSDPGRemove : public Message { static const int HEAD_VERSION = 3; - static const int COMPAT_VERSION = 2; + static const int COMPAT_VERSION = 3; epoch_t epoch = 0; @@ -46,46 +46,11 @@ public: const char *get_type_name() const override { return "PGrm"; } void encode_payload(uint64_t features) override { - if (HAVE_FEATURE(features, SERVER_LUMINOUS)) { - header.version = HEAD_VERSION; - } else { - // for jewel+kraken - header.version = 2; - ::encode(epoch, payload); - - vector _pg_list; - _pg_list.reserve(pg_list.size()); - vector _shard_list; - _shard_list.reserve(pg_list.size()); - for (auto i = pg_list.begin(); i != pg_list.end(); ++i) { - _pg_list.push_back(i->pgid); - _shard_list.push_back(i->shard); - } - ::encode(_pg_list, payload); - ::encode(_shard_list, payload); - return; - } ::encode(epoch, payload); ::encode(pg_list, payload); } void decode_payload() override { bufferlist::iterator p = payload.begin(); - if (header.version == 2) { - // jewel/kraken - ::decode(epoch, p); - vector _pg_list; - ::decode(_pg_list, p); - - vector _shard_list(_pg_list.size(), shard_id_t::NO_SHARD); - _shard_list.clear(); - ::decode(_shard_list, p); - assert(_shard_list.size() == _pg_list.size()); - pg_list.reserve(_shard_list.size()); - for (unsigned i = 0; i < _shard_list.size(); ++i) { - pg_list.push_back(spg_t(_pg_list[i], _shard_list[i])); - } - return; - } ::decode(epoch, p); ::decode(pg_list, p); } -- 2.39.5