From: Sage Weil <sage@newdream.net>
Date: Thu, 26 Oct 2017 21:14:43 +0000 (-0500)
Subject: Merge pull request #17805 from tchaikov/wip-luminous-pr-17508
X-Git-Tag: v12.2.2~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50c4cc06101fd1c8a9323cd3a04c92c8a9ab2580;p=ceph.git

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>
---

50c4cc06101fd1c8a9323cd3a04c92c8a9ab2580
diff --cc src/crush/CrushWrapper.h
index e9aa698b4ba7,ae682159d852..034cf1e9f3b6
--- a/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);