From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 15 Jul 2021 00:55:40 +0000 (-0700)
Subject: mds/FSMap: use DECODE_OLDEST to gate FSMap version
X-Git-Tag: v16.2.6~71^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98a4f3bedeb66fa57fd3ef3fa8a50795e5b4652e;p=ceph.git

mds/FSMap: use DECODE_OLDEST to gate FSMap version

This throws a proper exception which can be handled.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 47a8273faebf66737673af4fa04a58ac3628cdf3)
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index 2a3c674e924..cdd2a892215 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -644,8 +644,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);