From 7dc5eb5cac1dcf55dea8cf362fbd8b979ac6feec Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 7 Jul 2017 12:52:53 -0400 Subject: [PATCH] mon/OSDMonitor: clean up error messages Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 921b8f88199c1..76a7ee0c08042 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -7061,8 +7061,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } 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"; + ss << "you must complete the upgrade and 'ceph osd require-osd-release " + << "luminous' before using crush device classes"; err = -EPERM; goto reply; } @@ -7178,8 +7178,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } 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"; + ss << "you must complete the upgrade and 'ceph osd require-osd-release " + << "luminous' before using crush device classes"; err = -EPERM; goto reply; } @@ -7212,8 +7212,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } 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"; + ss << "you must complete the upgrade and 'ceph osd require-osd-release " + << "luminous' before using crush device classes"; err = -EPERM; goto reply; } @@ -7255,8 +7255,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } 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"; + ss << "you must complete the upgrade and 'ceph osd require-osd-release " + << "luminous' before using crush device classes"; err = -EPERM; goto reply; } @@ -8088,8 +8088,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, 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 set require_osd_release =" - << "luminous before using the new interface"; + ss << "you must complete the upgrade and 'ceph osd require-osd-release " + << "luminous' before using the new interface"; err = -EPERM; goto reply; } @@ -8113,8 +8113,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, 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 set require_osd_release =" - << "luminous before using the new interface"; + ss << "you must complete the upgrade and 'ceph osd require-osd-release " + << "luminous' before using the new interface"; err = -EPERM; goto reply; } @@ -8845,8 +8845,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, 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 set require_osd_release =" - << "luminous before using the new interface"; + ss << "you must complete the upgrade and 'ceph osd require-osd-release " + << "luminous' before using the new interface"; err = -EPERM; goto reply; } -- 2.39.5