From: Radosław Zarzyński <rzarzyns@redhat.com>
Date: Tue, 8 Oct 2024 13:14:49 +0000 (+0200)
Subject: tools: respect set features when adding addresses
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F62061%2Fhead;p=ceph.git

tools: respect set features when adding addresses

Fixes: https://tracker.ceph.com/issues/53751
Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>
(cherry picked from commit 19545eb9864b002c1a37d4f2509d1b2baa833128)
---

diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index f1b86e00362c..dc882a006a21 100644
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -375,6 +375,10 @@ int main(int argc, const char **argv)
       return r;
   }
 
+  if (handle_features(features, monmap)) {
+    modified = true;
+  }
+
   if (min_mon_release != ceph_release_t::unknown) {
     monmap.min_mon_release = min_mon_release;
     cout << "setting min_mon_release = " << min_mon_release << std::endl;
@@ -459,10 +463,6 @@ int main(int argc, const char **argv)
     monmap.remove(p);
   }
 
-  if (handle_features(features, monmap)) {
-    modified = true;
-  }
-
   if (!print && !modified && !show_features) {
     cerr << "no action specified" << std::endl;
     helpful_exit();