]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mds/FSMap: use DECODE_OLDEST to gate FSMap version
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 15 Jul 2021 00:55:40 +0000 (17:55 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 28 Jul 2021 14:07:05 +0000 (07:07 -0700)
This throws a proper exception which can be handled.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/FSMap.cc

index f88e446571dc5717203169d60401b296cb6d24bc..72ea71f3a2063f88316c4941f5e3fe9d83c1bb54 100644 (file)
@@ -656,8 +656,7 @@ void FSMap::encode(bufferlist& bl, uint64_t features) const
 void FSMap::decode(bufferlist::const_iterator& p)
 {
   DECODE_START(7, p);
-  if (struct_v <= 6)
-    ceph_abort("detected old mdsmap in mon stores");
+  DECODE_OLDEST(7);
   decode(epoch, p);
   decode(next_filesystem_id, p);
   decode(legacy_client_fscid, p);