From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Jul 2017 16:52:53 +0000 (-0400)
Subject: mon/OSDMonitor: clean up error messages
X-Git-Tag: v12.1.1~124^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dc5eb5cac1dcf55dea8cf362fbd8b979ac6feec;p=ceph.git

mon/OSDMonitor: clean up error messages

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 921b8f88199c..76a7ee0c0804 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;
     }