From 82ea25ae4fea3d1597119e0c695c5c9347f110a3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Sep 2017 14:57:00 -0400 Subject: [PATCH] mon/OSDMonitor: drop various luminous guards on new commands Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index b61a53426357e..c782c65c7b33c 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -7203,13 +7203,6 @@ 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 'ceph osd require-osd-release " - << "luminous' before using crush device classes"; - err = -EPERM; - goto reply; - } - string device_class; if (!cmd_getval(g_ceph_context, cmdmap, "class", device_class)) { err = -EINVAL; // no value! @@ -8130,15 +8123,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, cmd_getval(g_ceph_context, cmdmap, "type", type); cmd_getval(g_ceph_context, cmdmap, "class", device_class); - if (!device_class.empty()) { - if (osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) { - ss << "you must complete the upgrade and 'ceph osd require-osd-release " - << "luminous' before using crush device classes"; - err = -EPERM; - goto reply; - } - } - if (osdmap.crush->rule_exists(name)) { // The name is uniquely associated to a ruleid and the rule it contains // From the user point of view, the rule is more meaningfull. @@ -8466,12 +8450,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd set-full-ratio" || prefix == "osd set-backfillfull-ratio" || prefix == "osd set-nearfull-ratio") { - if (osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) { - ss << "you must complete the upgrade and 'ceph osd require-osd-release " - << "luminous' before using the new interface"; - err = -EPERM; - goto reply; - } double n; if (!cmd_getval(g_ceph_context, cmdmap, "ratio", n)) { ss << "unable to parse 'ratio' value '" @@ -8491,12 +8469,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, get_last_committed() + 1)); return true; } else if (prefix == "osd set-require-min-compat-client") { - if (osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) { - ss << "you must complete the upgrade and 'ceph osd require-osd-release " - << "luminous' before using the new interface"; - err = -EPERM; - goto reply; - } string v; cmd_getval(g_ceph_context, cmdmap, "version", v); int vno = ceph_release_from_name(v.c_str()); @@ -9261,12 +9233,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, prefix == "osd rm-pg-upmap" || prefix == "osd pg-upmap-items" || prefix == "osd rm-pg-upmap-items") { - if (osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) { - ss << "you must complete the upgrade and 'ceph osd require-osd-release " - << "luminous' before using the new interface"; - err = -EPERM; - goto reply; - } if (osdmap.require_min_compat_client < CEPH_RELEASE_LUMINOUS) { ss << "min_compat_client " << ceph_release_name(osdmap.require_min_compat_client) -- 2.39.5