]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/OSDMonitor: guard 'osd crush set-device-class'
authorSage Weil <sage@redhat.com>
Fri, 7 Jul 2017 16:17:36 +0000 (12:17 -0400)
committerSage Weil <sage@redhat.com>
Fri, 7 Jul 2017 16:17:36 +0000 (12:17 -0400)
Requires luminous.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index 032a42bb7e024202b0d7659e3cb2fb74dec946b6..921b8f88199c1b7750f80ec3a8344b170c798b6e 100644 (file)
@@ -7060,6 +7060,12 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     goto update;
 
   } else if (prefix == "osd crush set-device-class") {
+    if (osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) {
+      ss << "you must complete the upgrade and set require_osd_release ="
+        << "luminous before using crush device classes";
+      err = -EPERM;
+      goto reply;
+    }
     if (!osdmap.exists(osdid)) {
       err = -ENOENT;
       ss << name << " does not exist.  create it before updating the crush map";