From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 30 Mar 2021 21:07:46 +0000 (-0700)
Subject: mon: do not update inline incompat except via mds
X-Git-Tag: v17.1.0~1237^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8cdc36c89da224eb8e86ee6ed80cd2eb65354587;p=ceph.git

mon: do not update inline incompat except via mds

The MDS_FEATURE_INCOMPAT_INLINE feature indicates that an MDS knows how
to read/write inline data and that the file system may have it. The
separate setting for inline_data protects this file system feature.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index b0ffd4c34a427..b186f625b909c 100644
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -397,11 +397,6 @@ public:
         {
           fs->mds_map.set_inline_data_enabled(true);
         });
-
-        // Update `compat`
-        CompatSet c = fsmap.get_compat();
-        c.incompat.insert(MDS_FEATURE_INCOMPAT_INLINE);
-        fsmap.update_compat(c);
       } else {
 	ss << "inline data disabled";
         fsmap.modify_filesystem(