Merge pull request #17805 from tchaikov/wip-luminous-pr-17508

luminous: mon: more aggressively convert crush rulesets -> distinct rules

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/crush/CrushWrapper.cc
Simple merge

diff --cc src/crush/CrushWrapper.h
index e9aa698b4ba766138daef0c01951040bb473c062,ae682159d852a57d557b862dfe5feb39bf20ecc9..034cf1e9f3b65c51675c89d87e02729560d7be8b
--- 1/src/crush/CrushWrapper.h
--- 2/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@@ -1206,9 -1217,8 +1217,9 @@@ public
    void finalize() {
      assert(crush);
      crush_finalize(crush);
-     have_uniform_rules = !has_legacy_rulesets();
+     have_uniform_rules = !has_legacy_rule_ids();
    }
 +  int bucket_set_alg(int id, int alg);
  
    int update_device_class(int id, const string& class_name, const string& name, ostream *ss);
    int remove_device_class(CephContext *cct, int id, ostream *ss);

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSDMap.cc
Simple merge