From: Sage Weil <sage@redhat.com>
Date: Mon, 20 Nov 2017 14:55:59 +0000 (-0600)
Subject: mon/OSDMonitor: fix mon_fixup_legacy_erasure_code_profiles
X-Git-Tag: v12.2.3~247^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=134818228b5c0fa54e934c842038de0b9ad63620;p=ceph.git

mon/OSDMonitor: fix mon_fixup_legacy_erasure_code_profiles

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c9ff10b345f7..ec2887d80a65 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -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";