]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: fix mon_fixup_legacy_erasure_code_profiles
authorSage Weil <sage@redhat.com>
Mon, 20 Nov 2017 14:55:59 +0000 (08:55 -0600)
committerSage Weil <sage@redhat.com>
Mon, 20 Nov 2017 14:58:34 +0000 (08:58 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index c9ff10b345f72ecb7c7c3353f45fd4a3718f23e8..ec2887d80a65784ab01769e0ee6a9c20ff25e171 100644 (file)
@@ -5819,9 +5819,9 @@ int OSDMonitor::parse_erasure_code_profile(const vector<string> &erasure_code_pr
       string key = i->substr(0, equal);
       equal++;
       const string value = i->substr(equal);
-      if (key.find("ruleset-") == 0) {
-       if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS &&
-           g_conf->get_val<bool>("mon_fixup_legacy_erasure_code_profiles")) {
+      if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS &&
+         key.find("ruleset-") == 0) {
+       if (g_conf->get_val<bool>("mon_fixup_legacy_erasure_code_profiles")) {
          mon->clog->warn() << "erasure code profile property '" << key
                            << "' is no longer supported; try "
                            << "'crush-" << key.substr(8) << "' instead";