Merge pull request ceph#60197 from rzarzynski/wip-bug-53751

tools: respect set features when adding addresses Reviewed-by: Laura Flores <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]>
cybozu · Dec 16, 2024 · e53e5e9 · e53e5e9
2 parents ced280c + 19545eb
commit e53e5e9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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();