From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Feb 2017 20:50:41 +0000 (-0500)
Subject: mon/PGMonitor: disable old 'pg set_[near]full_ratio ...' in luminous
X-Git-Tag: v12.0.1~145^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=394e45ad812f4d5f44ba26941baba86d824ce1d3;p=ceph.git

mon/PGMonitor: disable old 'pg set_[near]full_ratio ...' in luminous

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

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 44708922f2259..4fd2109b664b8 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1344,6 +1344,12 @@ bool PGMonitor::prepare_command(MonOpRequestRef op)
     goto update;
   } else if (prefix == "pg set_full_ratio" ||
              prefix == "pg set_nearfull_ratio") {
+    if (mon->osdmon()->osdmap.test_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS)) {
+      ss << "please use the new luminous interfaces"
+	 << " ('osd set-full-ratio' and 'osd set-nearfull-ratio')";
+      r = -EPERM;
+      goto reply;
+    }
     double n;
     if (!cmd_getval(g_ceph_context, cmdmap, "ratio", n)) {
       ss << "unable to parse 'ratio' value '"