mon,crush: 'osd crush rule create-replicated ...'

New command to create crush rule that specifies a class of device.  Plus
all of the fallout in other callers to the CrushWrapper helpers, the
crushtool cli change, and cli test.

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

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index 13aecb0d632092a44d860f2aca558aea53b4f756..4246fd9fc554454446aec7028f7895d08f666ca3 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -224,9 +224,14 @@ Major Changes from Kraken
     - ``ceph osd reweightn`` will specify the `reweight` values for
       multiple OSDs in a single command.  This is equivalent to a series of
       ``ceph osd reweight`` commands.
-    - ``ceph crush class {create,rm,ls,rename}`` manage the new CRUSH *device
-      class* feature.  ``ceph crush set-device-class <osd> <class>``
-      will set the class for a particular device.
+    - ``ceph osd crush class {create,rm,ls,rename}`` manage the new
+      CRUSH *device class* feature.  ``ceph crush set-device-class
+      <osd> <class>`` will set the class for a particular device.
+    - ``ceph osd crush rule create-replicated`` replaces the old
+      ``ceph osd crush rule create-simple`` command to create a CRUSH
+      rule for a replicated pool.  Notably it takes a `class` argument
+      for the *device class* the rule should target (e.g., `ssd` or
+      `hdd`).
     - ``ceph mon feature ls`` will list monitor features recorded in the
       MonMap.  ``ceph mon feature set`` will set an optional feature (none of
       these exist yet).

diff --git a/qa/workunits/mon/crush_ops.sh b/qa/workunits/mon/crush_ops.sh
index 11891480a9053a24fbb29edb0450dbb8bff08b8e..8ef49acf638589c1b459c553e1302608610b1ceb 100755 (executable)
--- a/qa/workunits/mon/crush_ops.sh
+++ b/qa/workunits/mon/crush_ops.sh
@@ -19,6 +19,13 @@ ceph osd crush rule create-simple foo default host
 ceph osd crush rule create-simple foo default host
 ceph osd crush rule create-simple bar default host
 
+ceph osd crush class create ssd
+ceph osd crush class create hdd
+ceph osd crush set-device-class osd.0 ssd
+ceph osd crush set-device-class osd.1 hdd
+ceph osd crush rule create-replicated foo-ssd default host ssd
+ceph osd crush rule create-replicated foo-hdd default host hdd
+
 ceph osd crush rule ls | grep foo
 
 ceph osd crush rule rm foo

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 7d4dd3c6abbaf44a367b51160a7c18e45c64217f..6a0017df96d7cc3b7150a29a6ca38b2fbee4fdf8 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1300,8 +1300,10 @@ void CrushWrapper::reweight(CephContext *cct)
 int CrushWrapper::add_simple_rule_at(
   string name, string root_name,
   string failure_domain_name,
+  string device_class,
   string mode, int rule_type,
-  int rno, ostream *err)
+  int rno,
+  ostream *err)
 {
   if (rule_exists(name)) {
     if (err)
@@ -1340,6 +1342,22 @@ int CrushWrapper::add_simple_rule_at(
       return -EINVAL;
     }
   }
+  if (device_class.size()) {
+    if (!class_exists(device_class)) {
+      if (err)
+       *err << "device class " << device_class << " does not exist";
+      return -EINVAL;
+    }
+    int c = get_class_id(device_class);
+    if (class_bucket.count(root) == 0 ||
+       class_bucket[root].count(c) == 0) {
+      if (err)
+       *err << "root " << root_name << " has no devices with class "
+            << device_class;
+      return -EINVAL;
+    }
+    root = class_bucket[root][c];
+  }
   if (mode != "firstn" && mode != "indep") {
     if (err)
       *err << "unknown mode " << mode;
@@ -1387,10 +1405,12 @@ int CrushWrapper::add_simple_rule_at(
 int CrushWrapper::add_simple_rule(
   string name, string root_name,
   string failure_domain_name,
+  string device_class,
   string mode, int rule_type,
   ostream *err)
 {
-  return add_simple_rule_at(name, root_name, failure_domain_name, mode,
+  return add_simple_rule_at(name, root_name, failure_domain_name, device_class,
+                           mode,
                            rule_type, -1, err);
 }
 

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index 77fb35048bbc86ff44661614eff7fd63dedcdbf8..b5bfebb765780f44c2b002ff5a246047f2e7d37c 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -1015,6 +1015,7 @@ public:
 
   int add_simple_rule(
     string name, string root_name, string failure_domain_type,
+    string device_class,
     string mode, int rule_type, ostream *err = 0);
 
   /**
@@ -1022,7 +1023,7 @@ public:
    */
   int add_simple_rule_at(
     string name, string root_name,
-    string failure_domain_type, string mode,
+    string failure_domain_type, string device_class, string mode,
     int rule_type, int rno, ostream *err = 0);
 
   int remove_rule(int ruleno);

diff --git a/src/erasure-code/isa/ErasureCodeIsa.cc b/src/erasure-code/isa/ErasureCodeIsa.cc
index 4a6841abd6226e35bc7186afd66e1468c38b20d4..bd6c37ecc2ce7132b15dd9a0842f78358dd92356 100644 (file)
--- a/src/erasure-code/isa/ErasureCodeIsa.cc
+++ b/src/erasure-code/isa/ErasureCodeIsa.cc
@@ -55,6 +55,7 @@ ErasureCodeIsa::create_ruleset(const string &name,
     name,
     ruleset_root,
     ruleset_failure_domain,
+    "",
     "indep",
     pg_pool_t::TYPE_ERASURE,
     ss);

diff --git a/src/erasure-code/jerasure/ErasureCodeJerasure.cc b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
index ca1b09649f7a7c1b1a88a9c300a31c0f996428cd..85858773de31c1308a1fa9df41b3c2916b5ef120 100644 (file)
--- a/src/erasure-code/jerasure/ErasureCodeJerasure.cc
+++ b/src/erasure-code/jerasure/ErasureCodeJerasure.cc
@@ -47,7 +47,7 @@ int ErasureCodeJerasure::create_ruleset(const string &name,
                                        ostream *ss) const
 {
   int ruleid = crush.add_simple_rule(
-    name, ruleset_root, ruleset_failure_domain,
+    name, ruleset_root, ruleset_failure_domain, "",
     "indep", pg_pool_t::TYPE_ERASURE, ss);
   if (ruleid < 0)
     return ruleid;

diff --git a/src/erasure-code/shec/ErasureCodeShec.cc b/src/erasure-code/shec/ErasureCodeShec.cc
index c25732c47c566689b3961695096b21c89061d539..66d7d2b8c5fc2eff86a88ac48c70cccb79493c23 100644 (file)
--- a/src/erasure-code/shec/ErasureCodeShec.cc
+++ b/src/erasure-code/shec/ErasureCodeShec.cc
@@ -52,7 +52,7 @@ int ErasureCodeShec::create_ruleset(const string &name,
                                    ostream *ss) const
 {
   int ruleid = crush.add_simple_rule(
-    name, ruleset_root, ruleset_failure_domain,
+    name, ruleset_root, ruleset_failure_domain, "",
     "indep", pg_pool_t::TYPE_ERASURE, ss);
   if (ruleid < 0) {
     return ruleid;

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 053311e5c077128f7423c989c6f86bf6e9cfda3e..679166864749c9f4aa661045fae30fe09d6df12e 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -602,6 +602,13 @@ COMMAND("osd crush rule create-simple " \
        "name=mode,type=CephChoices,strings=firstn|indep,req=false",
        "create crush rule <name> to start from <root>, replicate across buckets of type <type>, using a choose mode of <firstn|indep> (default firstn; indep best for erasure pools)", \
        "osd", "rw", "cli,rest")
+COMMAND("osd crush rule create-replicated " \
+       "name=name,type=CephString,goodchars=[A-Za-z0-9-_.] " \
+       "name=root,type=CephString,goodchars=[A-Za-z0-9-_.] " \
+       "name=type,type=CephString,goodchars=[A-Za-z0-9-_.] " \
+       "name=class,type=CephString,goodchars=[A-Za-z0-9-_.],req=false",
+       "create crush rule <name> for replicated pool to start from <root>, replicate across buckets of type <type>, using a choose mode of <firstn|indep> (default firstn; indep best for erasure pools)", \
+       "osd", "rw", "cli,rest")
 COMMAND("osd crush rule create-erasure " \
        "name=name,type=CephString,goodchars=[A-Za-z0-9-_.] " \
        "name=profile,type=CephString,req=false,goodchars=[A-Za-z0-9-_.=]", \

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 405c05a8ee06a5bbe8b6eb8d66c2c2d42921ea09..2c8a7e5dc59ccca4a7ad9de25d0d243468b1db89 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7794,7 +7794,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       ss << "rule " << name << " already exists";
       err = 0;
     } else {
-      int ruleno = newcrush.add_simple_rule(name, root, type, mode,
+      int ruleno = newcrush.add_simple_rule(name, root, type, "", mode,
                                               pg_pool_t::TYPE_REPLICATED, &ss);
       if (ruleno < 0) {
        err = ruleno;
@@ -7809,6 +7809,46 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
                                              get_last_committed() + 1));
     return true;
 
+  } else if (prefix == "osd crush rule create-replicated") {
+    string name, root, type, device_class;
+    cmd_getval(g_ceph_context, cmdmap, "name", name);
+    cmd_getval(g_ceph_context, cmdmap, "root", root);
+    cmd_getval(g_ceph_context, cmdmap, "type", type);
+    cmd_getval(g_ceph_context, cmdmap, "class", device_class);
+
+    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.
+      ss << "rule " << name << " already exists";
+      err = 0;
+      goto reply;
+    }
+
+    CrushWrapper newcrush;
+    _get_pending_crush(newcrush);
+
+    if (newcrush.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.
+      ss << "rule " << name << " already exists";
+      err = 0;
+    } else {
+      int ruleno = newcrush.add_simple_rule(
+       name, root, type, device_class,
+       "firstn", pg_pool_t::TYPE_REPLICATED, &ss);
+      if (ruleno < 0) {
+       err = ruleno;
+       goto reply;
+      }
+
+      pending_inc.crush.clear();
+      newcrush.encode(pending_inc.crush, mon->get_quorum_con_features());
+    }
+    getline(ss, rs);
+    wait_for_finished_proposal(op, new Monitor::C_Command(mon, op, 0, rs,
+                                             get_last_committed() + 1));
+    return true;
+
   } else if (prefix == "osd erasure-code-profile rm") {
     string name;
     cmd_getval(g_ceph_context, cmdmap, "name", name);

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 4055dd160094487c003d421939072b3ca2945f27..2637df618bbd5891b0f8bfa13874cec67df1ebf0 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -3471,7 +3471,7 @@ int OSDMap::build_simple_crush_rules(
 
   int r;
   r = crush.add_simple_rule_at(
-    "replicated_rule", root, failure_domain,
+    "replicated_rule", root, failure_domain, "",
     "firstn", pg_pool_t::TYPE_REPLICATED,
     crush_rule, ss);
   if (r < 0)

diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t
index 27dc33e3c1f0035ef0800fbc7aae04b474d63fa8..c6f7c0f4d7fa6f55c9c17d1b0076beb3448b18f9 100755 (executable)
--- a/src/test/cli/crushtool/help.t
+++ b/src/test/cli/crushtool/help.t
@@ -62,6 +62,11 @@
                            create crush rule <name> to start from <root>,
                            replicate across buckets of type <type>, using
                            a choose mode of <firstn|indep>
+     -i mapfn --create-replicated-rule name root type
+                           create crush rule <name> to start from <root>,
+                           replicate across buckets of type <type>
+     --device-class <class>
+                           use device class <class> for new rule
      -i mapfn --remove-rule name
                            remove the specified crush rule
   

diff --git a/src/test/cli/crushtool/rules.t b/src/test/cli/crushtool/rules.t
new file mode 100644 (file)
index 0000000..68ead0b
--- /dev/null
+++ b/src/test/cli/crushtool/rules.t
@@ -0,0 +1,149 @@
+  $ crushtool -c $TESTDIR/rules.txt --create-replicated-rule foo default host -o one > /dev/null
+  $ crushtool -d one
+  # begin crush map
+
+  # devices
+  device 0 osd.0 class ssd
+  device 1 osd.1 class ssd
+  device 2 osd.2 class ssd
+  device 3 osd.3 class hdd
+  device 4 osd.4 class hdd
+  device 5 osd.5 class hdd
+
+  # types
+  type 0 osd
+  type 1 host
+  type 2 root
+
+  # buckets
+  host foo {
+  \tid -3\t\t# do not change unnecessarily (esc)
+  \tid -4 class ssd\t\t# do not change unnecessarily (esc)
+  \tid -7 class hdd\t\t# do not change unnecessarily (esc)
+  \t# weight 3.000 (esc)
+  \talg straw2 (esc)
+  \thash 0\t# rjenkins1 (esc)
+  \titem osd.0 weight 1.000 (esc)
+  \titem osd.1 weight 1.000 (esc)
+  \titem osd.2 weight 1.000 (esc)
+  }
+  host bar {
+  \tid -2\t\t# do not change unnecessarily (esc)
+  \tid -5 class ssd\t\t# do not change unnecessarily (esc)
+  \tid -8 class hdd\t\t# do not change unnecessarily (esc)
+  \t# weight 3.000 (esc)
+  \talg straw2 (esc)
+  \thash 0\t# rjenkins1 (esc)
+  \titem osd.3 weight 1.000 (esc)
+  \titem osd.4 weight 1.000 (esc)
+  \titem osd.5 weight 1.000 (esc)
+  }
+  root default {
+  \tid -1\t\t# do not change unnecessarily (esc)
+  \tid -6 class ssd\t\t# do not change unnecessarily (esc)
+  \tid -9 class hdd\t\t# do not change unnecessarily (esc)
+  \t# weight 6.000 (esc)
+  \talg straw2 (esc)
+  \thash 0\t# rjenkins1 (esc)
+  \titem foo weight 3.000 (esc)
+  \titem bar weight 3.000 (esc)
+  }
+
+  # rules
+  rule data {
+  \truleset 0 (esc)
+  \ttype replicated (esc)
+  \tmin_size 1 (esc)
+  \tmax_size 10 (esc)
+  \tstep take default (esc)
+  \tstep chooseleaf firstn 0 type host (esc)
+  \tstep emit (esc)
+  }
+  rule foo {
+  \truleset 1 (esc)
+  \ttype replicated (esc)
+  \tmin_size 1 (esc)
+  \tmax_size 10 (esc)
+  \tstep take default (esc)
+  \tstep chooseleaf firstn 0 type host (esc)
+  \tstep emit (esc)
+  }
+
+  # end crush map
+
+
+
+
+
+  $ crushtool -c $TESTDIR/rules.txt --create-replicated-rule foo-ssd default host -o two --device-class ssd > /dev/null
+  $ crushtool -d two
+  # begin crush map
+
+  # devices
+  device 0 osd.0 class ssd
+  device 1 osd.1 class ssd
+  device 2 osd.2 class ssd
+  device 3 osd.3 class hdd
+  device 4 osd.4 class hdd
+  device 5 osd.5 class hdd
+
+  # types
+  type 0 osd
+  type 1 host
+  type 2 root
+
+  # buckets
+  host foo {
+  \tid -3\t\t# do not change unnecessarily (esc)
+  \tid -4 class ssd\t\t# do not change unnecessarily (esc)
+  \tid -7 class hdd\t\t# do not change unnecessarily (esc)
+  \t# weight 3.000 (esc)
+  \talg straw2 (esc)
+  \thash 0\t# rjenkins1 (esc)
+  \titem osd.0 weight 1.000 (esc)
+  \titem osd.1 weight 1.000 (esc)
+  \titem osd.2 weight 1.000 (esc)
+  }
+  host bar {
+  \tid -2\t\t# do not change unnecessarily (esc)
+  \tid -5 class ssd\t\t# do not change unnecessarily (esc)
+  \tid -8 class hdd\t\t# do not change unnecessarily (esc)
+  \t# weight 3.000 (esc)
+  \talg straw2 (esc)
+  \thash 0\t# rjenkins1 (esc)
+  \titem osd.3 weight 1.000 (esc)
+  \titem osd.4 weight 1.000 (esc)
+  \titem osd.5 weight 1.000 (esc)
+  }
+  root default {
+  \tid -1\t\t# do not change unnecessarily (esc)
+  \tid -6 class ssd\t\t# do not change unnecessarily (esc)
+  \tid -9 class hdd\t\t# do not change unnecessarily (esc)
+  \t# weight 6.000 (esc)
+  \talg straw2 (esc)
+  \thash 0\t# rjenkins1 (esc)
+  \titem foo weight 3.000 (esc)
+  \titem bar weight 3.000 (esc)
+  }
+
+  # rules
+  rule data {
+  \truleset 0 (esc)
+  \ttype replicated (esc)
+  \tmin_size 1 (esc)
+  \tmax_size 10 (esc)
+  \tstep take default (esc)
+  \tstep chooseleaf firstn 0 type host (esc)
+  \tstep emit (esc)
+  }
+  rule foo-ssd {
+  \truleset 1 (esc)
+  \ttype replicated (esc)
+  \tmin_size 1 (esc)
+  \tmax_size 10 (esc)
+  \tstep take default class ssd (esc)
+  \tstep chooseleaf firstn 0 type host (esc)
+  \tstep emit (esc)
+  }
+
+  # end crush map

diff --git a/src/test/cli/crushtool/rules.txt b/src/test/cli/crushtool/rules.txt
new file mode 100644 (file)
index 0000000..c7acf52
--- /dev/null
+++ b/src/test/cli/crushtool/rules.txt
@@ -0,0 +1,54 @@
+# begin crush map
+
+# devices
+device 0 osd.0 class ssd
+device 1 osd.1 class ssd
+device 2 osd.2 class ssd
+device 3 osd.3 class hdd
+device 4 osd.4 class hdd
+device 5 osd.5 class hdd
+
+# types
+type 0 osd
+type 1 host
+type 2 root
+
+# buckets
+host foo {
+     id -3
+     alg straw2
+     hash 0
+     item osd.0 weight 1.0
+     item osd.1 weight 1.0
+     item osd.2 weight 1.0
+}
+
+host bar {
+     id -2
+     alg straw2
+     hash 0
+     item osd.3 weight 1.0
+     item osd.4 weight 1.0
+     item osd.5 weight 1.0
+}
+
+root default {
+     id -1
+     alg straw2
+     hash 0
+     item foo weight 3.0
+     item bar weight 3.0
+}
+
+# rules
+rule data {
+       ruleset 0
+       type replicated
+       min_size 1
+       max_size 10
+       step take default
+       step chooseleaf firstn 0 type host
+       step emit
+}
+
+# end crush map

diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc
index 2d6945d8598acbfc568b28359ba77834c4662fbe..e0a327ffff3d83d5d8a907279315217c4a5d490d 100644 (file)
--- a/src/test/crush/CrushWrapper.cc
+++ b/src/test/crush/CrushWrapper.cc
@@ -909,7 +909,7 @@ TEST(CrushWrapper, dump_rules) {
   }
 
   string name("NAME");
-  int rule = c->add_simple_rule(name, root_name, failure_domain_type,
+  int rule = c->add_simple_rule(name, root_name, failure_domain_type, "",
                                   "firstn", pg_pool_t::TYPE_ERASURE);
   EXPECT_EQ(0, rule);
 
@@ -1032,7 +1032,8 @@ TEST(CrushWrapper, choose_args_compat) {
   item = 2;
   c.insert_item(g_ceph_context, item, weight, "osd.2", loc);
 
-  assert(c.add_simple_rule("rule1", "r11", "host", "firstn", pg_pool_t::TYPE_ERASURE) >= 0);
+  assert(c.add_simple_rule("rule1", "r11", "host", "",
+                          "firstn", pg_pool_t::TYPE_ERASURE) >= 0);
 
   int id = c.get_item_id("b1");
 
@@ -1102,7 +1103,8 @@ TEST(CrushWrapper, remove_unused_root) {
   loc["root"] = "default";
   c.insert_item(g_ceph_context, item, weight, "osd.2", loc);
 
-  assert(c.add_simple_rule("rule1", "r11", "host", "firstn", pg_pool_t::TYPE_ERASURE) >= 0);
+  assert(c.add_simple_rule("rule1", "r11", "host", "",
+                          "firstn", pg_pool_t::TYPE_ERASURE) >= 0);
   ASSERT_TRUE(c.name_exists("default"));
   ASSERT_TRUE(c.name_exists("r11"));
   ASSERT_TRUE(c.name_exists("r12"));
@@ -1346,7 +1348,8 @@ TEST(CrushWrapper, try_remap_rule) {
   {
     cout << "take + choose + emit" << std::endl;
     ostringstream err;
-    int rule = c.add_simple_rule("one", "default", "osd", "firstn", 0, &err);
+    int rule = c.add_simple_rule("one", "default", "osd", "",
+                                "firstn", 0, &err);
     ASSERT_EQ(rule, 0);
 
     vector<int> orig = { 0, 3, 9 };
@@ -1382,7 +1385,8 @@ TEST(CrushWrapper, try_remap_rule) {
   {
     cout << "take + chooseleaf + emit" << std::endl;
     ostringstream err;
-    int rule = c.add_simple_rule("two", "default", "host", "firstn", 0, &err);
+    int rule = c.add_simple_rule("two", "default", "host", "",
+                                "firstn", 0, &err);
     ASSERT_EQ(rule, 1);
 
     vector<int> orig = { 0, 3, 9 };

diff --git a/src/test/crush/crush.cc b/src/test/crush/crush.cc
index 6b7d45624c7b83a3055ff42c88c93baddac9b39e..4a5fc63d6a3f26ced00c7ac902cd748f9eddddff 100644 (file)
--- a/src/test/crush/crush.cc
+++ b/src/test/crush/crush.cc
@@ -271,7 +271,7 @@ TEST(CRUSH, straw_zero) {
   EXPECT_EQ(0, c->set_item_name(root0, root_name0));
 
   string name0("rule0");
-  int rule0 = c->add_simple_rule(name0, root_name0, "osd",
+  int rule0 = c->add_simple_rule(name0, root_name0, "osd", "",
                                       "firstn", pg_pool_t::TYPE_REPLICATED);
   EXPECT_EQ(0, rule0);
 
@@ -282,7 +282,7 @@ TEST(CRUSH, straw_zero) {
   EXPECT_EQ(0, c->set_item_name(root1, root_name1));
 
   string name1("rule1");
-  int rule1 = c->add_simple_rule(name1, root_name1, "osd",
+  int rule1 = c->add_simple_rule(name1, root_name1, "osd", "",
                                       "firstn", pg_pool_t::TYPE_REPLICATED);
   EXPECT_EQ(1, rule1);
 
@@ -336,7 +336,7 @@ TEST(CRUSH, straw_same) {
   EXPECT_EQ(0, c->set_item_name(root0, root_name0));
 
   string name0("rule0");
-  int rule0 = c->add_simple_rule(name0, root_name0, "osd",
+  int rule0 = c->add_simple_rule(name0, root_name0, "osd", "",
                                       "firstn", pg_pool_t::TYPE_REPLICATED);
   EXPECT_EQ(0, rule0);
 
@@ -352,7 +352,7 @@ TEST(CRUSH, straw_same) {
   EXPECT_EQ(0, c->set_item_name(root1, root_name1));
 
   string name1("rule1");
-  int rule1 = c->add_simple_rule(name1, root_name1, "osd",
+  int rule1 = c->add_simple_rule(name1, root_name1, "osd", "",
                                       "firstn", pg_pool_t::TYPE_REPLICATED);
   EXPECT_EQ(1, rule1);
 
@@ -436,7 +436,7 @@ double calc_straw2_stddev(int *weights, int n, bool verbose)
   c->set_item_name(root0, root_name0);
 
   string name0("rule0");
-  int rule0 = c->add_simple_rule(name0, root_name0, "osd",
+  int rule0 = c->add_simple_rule(name0, root_name0, "osd", "",
                                       "firstn", pg_pool_t::TYPE_REPLICATED);
 
   int sum[n];
@@ -561,7 +561,7 @@ TEST(CRUSH, straw2_reweight) {
   EXPECT_EQ(0, c->set_item_name(root0, root_name0));
 
   string name0("rule0");
-  int rule0 = c->add_simple_rule(name0, root_name0, "osd",
+  int rule0 = c->add_simple_rule(name0, root_name0, "osd", "",
                                       "firstn", pg_pool_t::TYPE_REPLICATED);
   EXPECT_EQ(0, rule0);
 
@@ -577,7 +577,7 @@ TEST(CRUSH, straw2_reweight) {
   EXPECT_EQ(0, c->set_item_name(root1, root_name1));
 
   string name1("rule1");
-  int rule1 = c->add_simple_rule(name1, root_name1, "osd",
+  int rule1 = c->add_simple_rule(name1, root_name1, "osd", "",
                                       "firstn", pg_pool_t::TYPE_REPLICATED);
   EXPECT_EQ(1, rule1);
 

diff --git a/src/test/erasure-code/ErasureCodeExample.h b/src/test/erasure-code/ErasureCodeExample.h
index ef8e3e4c24083f4f9f9637510c4594ee6670c65a..5dbc73b383a9c4656f88cfe36665c525a548e650 100644 (file)
--- a/src/test/erasure-code/ErasureCodeExample.h
+++ b/src/test/erasure-code/ErasureCodeExample.h
@@ -42,7 +42,7 @@ public:
   int create_ruleset(const string &name,
                             CrushWrapper &crush,
                             ostream *ss) const override {
-    return crush.add_simple_rule(name, "default", "host",
+    return crush.add_simple_rule(name, "default", "host", "",
                                 "indep", pg_pool_t::TYPE_ERASURE, ss);
   }
   

diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc
index 32b2065cef4dd1a834d06e73874ebf65aa749bb1..8aa31e6161189d42d17e69ef39be271267000c43 100644 (file)
--- a/src/test/osd/TestOSDMap.cc
+++ b/src/test/osd/TestOSDMap.cc
@@ -60,7 +60,7 @@ public:
 
     // Create an EC ruleset and a pool using it
     int r = osdmap.crush->add_simple_rule(
-      "erasure", "default", "osd",
+      "erasure", "default", "osd", "",
       "indep", pg_pool_t::TYPE_ERASURE,
       &cerr);
 

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index b73a1d8c2adc7ece38f31e60b9eb5c5f8be6cff1..2a1bc83b8f86fda509dc51cd9f597bd20174dfba 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -170,6 +170,11 @@ void usage()
        << "                         create crush rule <name> to start from <root>,\n"
        << "                         replicate across buckets of type <type>, using\n"
        << "                         a choose mode of <firstn|indep>\n";
+  cout << "   -i mapfn --create-replicated-rule name root type\n"
+       << "                         create crush rule <name> to start from <root>,\n"
+       << "                         replicate across buckets of type <type>\n";
+  cout << "   --device-class <class>\n";
+  cout << "                         use device class <class> for new rule\n";
   cout << "   -i mapfn --remove-rule name\n"
        << "                         remove the specified crush rule\n";
   cout << "\n";
@@ -259,7 +264,7 @@ int main(int argc, const char **argv)
   int add_item = -1;
   bool update_item = false;
   bool add_rule = false;
-  std::string rule_name, rule_root, rule_type, rule_mode;
+  std::string rule_name, rule_root, rule_type, rule_mode, rule_device_class;
   bool del_rule = false;
   float add_weight = 0;
   map<string,string> add_loc;
@@ -450,6 +455,41 @@ int main(int argc, const char **argv)
            << " mode=" << rule_mode
            << std::endl;
       add_rule = true;
+    } else if (ceph_argparse_witharg(args, i, &val, err, "--create-replicated-rule", (char*)NULL)) {
+      rule_name.assign(val);
+      if (!err.str().empty()) {
+        cerr << err.str() << std::endl;
+        return EXIT_FAILURE;
+      }
+      if (i == args.end()) {
+        cerr << "expecting additional argument to --create-replicated-rule" << std::endl;
+        return EXIT_FAILURE;
+      }
+
+      rule_root.assign(*i);
+      i = args.erase(i);
+      if (i == args.end()) {
+        cerr << "expecting additional argument to --create-replicated-rule" << std::endl;
+        return EXIT_FAILURE;
+      }
+
+      rule_type.assign(*i);
+      i = args.erase(i);
+      rule_mode = "firstn";
+
+      cout << "--create-replicated-rule:"
+           << " name=" << rule_name
+           << " root=" << rule_root
+           << " type=" << rule_type
+           << std::endl;
+      add_rule = true;
+
+    } else if (ceph_argparse_witharg(args, i, &val, "--device-class", (char*)NULL)) {
+      rule_device_class.assign(val);
+      if (!err.str().empty()) {
+        cerr << err.str() << std::endl;
+        return EXIT_FAILURE;
+      }
     } else if (ceph_argparse_witharg(args, i, &val, "--remove-rule", (char*)NULL)) {
       rule_name.assign(val);
       if (!err.str().empty()) {
@@ -896,8 +936,9 @@ int main(int argc, const char **argv)
       cerr << "rule " << rule_name << " already exists" << std::endl;
       return EXIT_FAILURE;
     }
-    int r = crush.add_simple_rule(rule_name, rule_root, rule_type, rule_mode,
-      pg_pool_t::TYPE_REPLICATED, &err);
+    int r = crush.add_simple_rule(rule_name, rule_root, rule_type,
+                                 rule_device_class,
+                                 rule_mode, pg_pool_t::TYPE_REPLICATED, &err);
     if (r < 0) {
       cerr << err.str() << std::endl;
       return EXIT_FAILURE;