PGMonitor: return -EPERM on pg force-* commands during upgrade

Return -EPERM on pg force-* commands during upgrade.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 37324608be5ad7cd3ad3e644f1df3cfbf632e9ba..c4091ed08a1ffdb7b7cbb22aa5d9d26eb00761d7 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1063,6 +1063,16 @@ bool PGMonitor::prepare_command(MonOpRequestRef op)
     }
     ss << "pg " << pgidstr << " now creating, ok";
     goto update;
+  } else if (prefix == "pg force-recovery" ||
+             prefix == "pg force-backfill" ||
+             prefix == "pg cancel-force-recovery" ||
+             prefix == "pg cancel-force-backfill") {
+    if (mon->osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
+      ss << "you must complete the upgrade and 'ceph osd require-osd-release "
+        << "luminous' before using forced recovery";
+      r = -EPERM;
+      goto reply;
+    }
   } else if (prefix == "pg set_full_ratio" ||
              prefix == "pg set_nearfull_ratio") {
     if (mon->osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {