mon: scrub 'ruleset' from user-visible output

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index df73b63120e78de817936d9e43db8586323c2bfa..4df1ad3a7a76fc1d9608d9c6d6af952beebf92ac 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4844,7 +4844,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
     } else {
       int ruleno = osdmap.crush->get_rule_id(name);
       if (ruleno < 0) {
-       ss << "unknown crush ruleset '" << name << "'";
+       ss << "unknown crush rule '" << name << "'";
        r = ruleno;
        goto reply;
       }
@@ -5487,7 +5487,7 @@ int OSDMonitor::prepare_pool_crush_ruleset(const unsigned pool_type,
          *crush_ruleset = osdmap.crush->get_osd_pool_default_crush_replicated_ruleset(g_ceph_context);
          if (*crush_ruleset < 0) {
            // Errors may happen e.g. if no valid ruleset is available
-           *ss << "No suitable CRUSH ruleset exists, check "
+           *ss << "No suitable CRUSH rule exists, check "
                 << "'osd pool default crush *' config options";
            return -ENOENT;
          }
@@ -5503,7 +5503,7 @@ int OSDMonitor::prepare_pool_crush_ruleset(const unsigned pool_type,
                                               crush_ruleset, ss);
        switch (err) {
        case -EALREADY:
-         dout(20) << "prepare_pool_crush_ruleset: ruleset "
+         dout(20) << "prepare_pool_crush_ruleset: rule "
                   << ruleset_name << " try again" << dendl;
          // fall through
        case 0:
@@ -5525,7 +5525,7 @@ int OSDMonitor::prepare_pool_crush_ruleset(const unsigned pool_type,
     }
   } else {
     if (!osdmap.crush->ruleset_exists(*crush_ruleset)) {
-      *ss << "CRUSH ruleset " << *crush_ruleset << " not found";
+      *ss << "CRUSH rule " << *crush_ruleset << " not found";
       return -ENOENT;
     }
   }
@@ -5549,12 +5549,12 @@ int OSDMonitor::get_crush_ruleset(const string &ruleset_name,
     ret = newcrush.get_rule_id(ruleset_name);
     if (ret != -ENOENT) {
       // found it, wait for it to be proposed
-      dout(20) << __func__ << ": ruleset " << ruleset_name
+      dout(20) << __func__ << ": rule " << ruleset_name
               << " try again" << dendl;
       return -EAGAIN;
     } else {
       //Cannot find it , return error
-      *ss << "specified ruleset " << ruleset_name << " doesn't exist";
+      *ss << "specified rule " << ruleset_name << " doesn't exist";
       return ret;
     }
   }
@@ -7719,7 +7719,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     if (osdmap.crush->rule_exists(name)) {
       // The name is uniquely associated to a ruleid and the ruleset it contains
       // From the user point of view, the ruleset is more meaningfull.
-      ss << "ruleset " << name << " already exists";
+      ss << "rule " << name << " already exists";
       err = 0;
       goto reply;
     }
@@ -7730,7 +7730,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     if (newcrush.rule_exists(name)) {
       // The name is uniquely associated to a ruleid and the ruleset it contains
       // From the user point of view, the ruleset is more meaningfull.
-      ss << "ruleset " << name << " already exists";
+      ss << "rule " << name << " already exists";
       err = 0;
     } else {
       int ruleno = newcrush.add_simple_ruleset(name, root, type, mode,
@@ -7909,7 +7909,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
        break;
       }
     } else {
-      ss << "created ruleset " << name << " at " << ruleset;
+      ss << "created rule " << name << " at " << ruleset;
     }
 
     getline(ss, rs);
@@ -7942,7 +7942,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       // complexity now.
       int ruleset = newcrush.get_rule_mask_ruleset(ruleno);
       if (osdmap.crush_ruleset_in_use(ruleset)) {
-       ss << "crush ruleset " << name << " " << ruleset << " is in use";
+       ss << "crush rule " << name << " " << ruleset << " is in use";
        err = -EBUSY;
        goto reply;
       }
@@ -9531,7 +9531,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
        if (erasure_code_profile == "default") {
          ruleset_name = "erasure-code";
        } else {
-         dout(1) << "implicitly use ruleset named after the pool: "
+         dout(1) << "implicitly use rule named after the pool: "
                << poolstr << dendl;
          ruleset_name = poolstr;
        }

diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index e2e1cb55f579870df77c8bd279e050d460890c9f..cac15998abd5e3f02524c39cba84c53b9970be15 100755 (executable)
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -197,7 +197,7 @@ function TEST_replicated_pool_with_non_existent_default_ruleset_0() {
     ceph tell mon.a injectargs -- \
         --osd_pool_default_crush_replicated_ruleset 66 || return 1
     ceph osd pool create mypool 12 12 replicated 2>&1 | \
-        grep "No suitable CRUSH ruleset exists" || return 1
+        grep "No suitable CRUSH rule exists" || return 1
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
     ! grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
 }
@@ -209,7 +209,7 @@ function TEST_replicated_pool_with_non_existent_default_ruleset_1() {
     ceph tell mon.a injectargs -- \
         --osd_pool_default_crush_rule 55 || return 1
     ceph osd pool create mypool 12 12 replicated 2>&1 | \
-        grep "No suitable CRUSH ruleset exists" || return 1
+        grep "No suitable CRUSH rule exists" || return 1
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
     grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
 }
@@ -221,7 +221,7 @@ function TEST_replicated_pool_with_non_existent_default_ruleset_2() {
         --osd_pool_default_crush_rule 77 \
         --osd_pool_default_crush_replicated_ruleset 33 || return 1
     ceph osd pool create mypool 12 12 replicated 2>&1 | \
-        grep "No suitable CRUSH ruleset exists" || return 1
+        grep "No suitable CRUSH rule exists" || return 1
     CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
     grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
 }