crush: s/ruleset/id/ in decompiled output

Moving away from the 'ruleset' terminology.

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

diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
index b7c7a389047a968e57df492aba11656de087a3ff..af0dd875848c43c5a7f6d24fa99046a259338306 100644 (file)
--- a/src/crush/CrushCompiler.cc
+++ b/src/crush/CrushCompiler.cc
@@ -350,7 +350,10 @@ int CrushCompiler::decompile(ostream &out)
     if (crush.get_rule_name(i))
       print_rule_name(out, i, crush);
     out << " {\n";
-    out << "\truleset " << crush.get_rule_mask_ruleset(i) << "\n";
+    out << "\tid " << i << "\n";
+    if (i != crush.get_rule_mask_ruleset(i)) {
+      out << "\t# WARNING: ruleset " << crush.get_rule_mask_ruleset(i) << " != id " << i << "; this will not recompile to the same map\n";
+    }
 
     switch (crush.get_rule_mask_type(i)) {
     case CEPH_PG_TYPE_REPLICATED:

diff --git a/src/crush/grammar.h b/src/crush/grammar.h
index 8fb28c877a40d6ee68fba493a69afc2d6018153b..42a6068b362ba1d1a1f45b1612a6879adbf24c09 100644 (file)
--- a/src/crush/grammar.h
+++ b/src/crush/grammar.h
@@ -161,7 +161,7 @@ struct crush_grammar : public grammar<crush_grammar>
                                step_chooseleaf |
                                step_emit );
       crushrule = str_p("rule") >> !name >> '{'
-                          >> str_p("ruleset") >> posint
+                               >> (str_p("id") | str_p("ruleset")) >> posint
                           >> str_p("type") >> ( str_p("replicated") | str_p("erasure") )
                           >> str_p("min_size") >> posint
                           >> str_p("max_size") >> posint

diff --git a/src/test/cli/crushtool/add-item.t b/src/test/cli/crushtool/add-item.t
index 261715ca6cafb43b1700ebbefff365a03e0c4578..17127db590f63ba19d4f525de3ad73a1d2573635 100644 (file)
--- a/src/test/cli/crushtool/add-item.t
+++ b/src/test/cli/crushtool/add-item.t
@@ -32,7 +32,7 @@
   
   # rules
   rule data {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -41,7 +41,7 @@
   \tstep emit (esc)
   }
   rule metadata {
-  \truleset 1 (esc)
+  \tid 1 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -50,7 +50,7 @@
   \tstep emit (esc)
   }
   rule rbd {
-  \truleset 2 (esc)
+  \tid 2 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -59,7 +59,7 @@
   \tstep emit (esc)
   }
   rule simple-rule {
-  \truleset 3 (esc)
+  \tid 3 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -101,7 +101,7 @@
   
   # rules
   rule data {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -110,7 +110,7 @@
   \tstep emit (esc)
   }
   rule metadata {
-  \truleset 1 (esc)
+  \tid 1 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -119,7 +119,7 @@
   \tstep emit (esc)
   }
   rule rbd {
-  \truleset 2 (esc)
+  \tid 2 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)

diff --git a/src/test/cli/crushtool/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t
index bf9ab0c4dd20476780f5f7eb6f7c1715a1ab946c..9f27dd9432abae2ebdab419e958f800d50f6bc16 100644 (file)
--- a/src/test/cli/crushtool/arg-order-checks.t
+++ b/src/test/cli/crushtool/arg-order-checks.t
@@ -190,7 +190,7 @@
   
   # rules
   rule replicated_rule {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index bebfd7fdcb7ed18191fab06d34eb424dd92b5e68..eadd96942811379a0af94d61de071d1a6443b377 100644 (file)
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -52,7 +52,7 @@
   
   # rules
   rule replicated_rule {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)

diff --git a/src/test/cli/crushtool/choose-args.crush b/src/test/cli/crushtool/choose-args.crush
index 2ed6c2315d0d376f916a340e15eb14b4b690bbc3..332f2e4f9a7108d66c3cc884e6a5c10933dec007 100644 (file)
--- a/src/test/cli/crushtool/choose-args.crush
+++ b/src/test/cli/crushtool/choose-args.crush
@@ -52,7 +52,7 @@ root root {
 
 # rules
 rule data {
-       ruleset 3
+       id 3
        type replicated
        min_size 2
        max_size 2

diff --git a/src/test/cli/crushtool/choose-args.t b/src/test/cli/crushtool/choose-args.t
index 6f1b47274acaf999a0512cbe994897d9d70d6a60..dbe8e5bba7e6cac4fefece428c3b876b9ce7e3b0 100644 (file)
--- a/src/test/cli/crushtool/choose-args.t
+++ b/src/test/cli/crushtool/choose-args.t
@@ -132,7 +132,7 @@
       ],
       "rules": [
           {
-              "rule_id": 0,
+              "rule_id": 3,
               "rule_name": "data",
               "ruleset": 3,
               "type": 1,

diff --git a/src/test/cli/crushtool/device-class.crush b/src/test/cli/crushtool/device-class.crush
index 702000638c1f7966fe99d793d03f4f07df525c90..a3c1a1f0eab68ad8bc8a1d7b246fa9edaa606c98 100644 (file)
--- a/src/test/cli/crushtool/device-class.crush
+++ b/src/test/cli/crushtool/device-class.crush
@@ -62,7 +62,7 @@ root root {
 
 # rules
 rule data-ssd {
-       ruleset 1
+       id 1
        type replicated
        min_size 2
        max_size 2
@@ -71,7 +71,7 @@ rule data-ssd {
        step emit
 }
 rule data-hdd {
-       ruleset 2
+       id 2
        type replicated
        min_size 2
        max_size 2
@@ -80,7 +80,7 @@ rule data-hdd {
        step emit
 }
 rule data {
-       ruleset 3
+       id 3
        type replicated
        min_size 2
        max_size 2

diff --git a/src/test/cli/crushtool/multitype.after b/src/test/cli/crushtool/multitype.after
index 9c7da0aad6ca4869e333694d67754f16c63c7bb2..15bfd9af3745874b06eeb75699c82b08981dcb08 100644 (file)
--- a/src/test/cli/crushtool/multitype.after
+++ b/src/test/cli/crushtool/multitype.after
@@ -57,7 +57,7 @@ cluster cluster0 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -66,7 +66,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -75,7 +75,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/need_tree_order.crush b/src/test/cli/crushtool/need_tree_order.crush
index d7da94e977cc1d6f833beea71446a5f68415b8b0..4625edd72bbc5e573545db0e67e96edd6a594a43 100644 (file)
--- a/src/test/cli/crushtool/need_tree_order.crush
+++ b/src/test/cli/crushtool/need_tree_order.crush
@@ -52,7 +52,7 @@ root root {
 
 # rules
 rule data {
-       ruleset 1
+       id 1
        type replicated
        min_size 2
        max_size 2

diff --git a/src/test/cli/crushtool/rules.t b/src/test/cli/crushtool/rules.t
index bda3c13a444458640ccfc3b5efe773b87edd5610..e90ddbcf7cbfea8198de06cea4d931c2c36c1af9 100644 (file)
--- a/src/test/cli/crushtool/rules.t
+++ b/src/test/cli/crushtool/rules.t
@@ -51,7 +51,7 @@
   
   # rules
   rule data {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -60,7 +60,7 @@
   \tstep emit (esc)
   }
   rule foo {
-  \truleset 1 (esc)
+  \tid 1 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -133,7 +133,7 @@
   
   # rules
   rule data {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -142,7 +142,7 @@
   \tstep emit (esc)
   }
   rule foo-ssd {
-  \truleset 1 (esc)
+  \tid 1 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)

diff --git a/src/test/cli/crushtool/set-choose.crushmap.txt b/src/test/cli/crushtool/set-choose.crushmap.txt
index bc890e0214634de3dc3f456b02023d7bc2ea3ce9..8530436c02630f89d3448c5de30bbef2cfe609de 100644 (file)
--- a/src/test/cli/crushtool/set-choose.crushmap.txt
+++ b/src/test/cli/crushtool/set-choose.crushmap.txt
@@ -68,7 +68,7 @@ root root0 {
 
 # rules
 rule choose {
-       ruleset 1
+       id 0
        type replicated
        min_size 2
        max_size 3
@@ -79,7 +79,7 @@ rule choose {
 }
 
 rule choose-two {
-       ruleset 2
+       id 1
        type replicated
        min_size 2
        max_size 3
@@ -89,7 +89,7 @@ rule choose-two {
 }
 
 rule chooseleaf {
-       ruleset 3
+       id 2
        type replicated
        min_size 2
        max_size 3
@@ -99,7 +99,7 @@ rule chooseleaf {
 }
 
 rule choose-set {
-       ruleset 4
+       id 3
        type replicated
        min_size 2
        max_size 3
@@ -114,7 +114,7 @@ rule choose-set {
 }
 
 rule choose-set-two {
-       ruleset 5
+       id 4
        type replicated
        min_size 2
        max_size 3
@@ -128,7 +128,7 @@ rule choose-set-two {
 }
 
 rule chooseleaf-set {
-       ruleset 6
+       id 5
        type replicated
        min_size 2
        max_size 3

diff --git a/src/test/cli/crushtool/simple.template.adj.three b/src/test/cli/crushtool/simple.template.adj.three
index fca0fe162f4379124c14a69ca16b047b78ec7eab..2532e88a4c1af7062a37700aef49eb2757e6c659 100644 (file)
--- a/src/test/cli/crushtool/simple.template.adj.three
+++ b/src/test/cli/crushtool/simple.template.adj.three
@@ -34,7 +34,7 @@ cluster cluster0 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -43,7 +43,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -52,7 +52,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/simple.template.adj.two b/src/test/cli/crushtool/simple.template.adj.two
index 21c29a3afefc8760ce7d6eacd47334a003539b68..7c911c45f3127d645f84ee75bace678f31e5d113 100644 (file)
--- a/src/test/cli/crushtool/simple.template.adj.two
+++ b/src/test/cli/crushtool/simple.template.adj.two
@@ -34,7 +34,7 @@ cluster cluster0 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -43,7 +43,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -52,7 +52,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/simple.template.five b/src/test/cli/crushtool/simple.template.five
index 240e81de021d82c1e2e4a5d6c4565b4c90cfe281..6f2c5f43f8ef05d0c4113ac69d20bb67e6ffe274 100644 (file)
--- a/src/test/cli/crushtool/simple.template.five
+++ b/src/test/cli/crushtool/simple.template.five
@@ -35,7 +35,7 @@ cluster cluster0 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -44,7 +44,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -53,7 +53,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/simple.template.four b/src/test/cli/crushtool/simple.template.four
index aa16bbdedc327d7fc74c77713d1e9a2c4af9058e..31dcecdca4ad49b21e9c060ba528ed6ef4b3befe 100644 (file)
--- a/src/test/cli/crushtool/simple.template.four
+++ b/src/test/cli/crushtool/simple.template.four
@@ -26,7 +26,7 @@ cluster cluster0 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -35,7 +35,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -44,7 +44,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/simple.template.multitree.reweighted b/src/test/cli/crushtool/simple.template.multitree.reweighted
index caad7ab771ab241c4372e88a4a8eae500d679347..b337d28f7c62ea522edeae3e9cb9df89cefc4c2b 100644 (file)
--- a/src/test/cli/crushtool/simple.template.multitree.reweighted
+++ b/src/test/cli/crushtool/simple.template.multitree.reweighted
@@ -43,7 +43,7 @@ cluster cluster1 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -52,7 +52,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -61,7 +61,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/simple.template.two b/src/test/cli/crushtool/simple.template.two
index 9a3aee7349dde8c482977b56967bf63ab9fccd90..099ff70c1f23d7f11a20f1290fce7ea241e16950 100644 (file)
--- a/src/test/cli/crushtool/simple.template.two
+++ b/src/test/cli/crushtool/simple.template.two
@@ -28,7 +28,7 @@ cluster cluster0 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -37,7 +37,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -46,7 +46,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/straw2.txt b/src/test/cli/crushtool/straw2.txt
index 0928aa5b929751a6cc0f0f1ac4d5e0765fbdd03b..0531c7ad197bc0dce4c76e11d7f84be660f60196 100644 (file)
--- a/src/test/cli/crushtool/straw2.txt
+++ b/src/test/cli/crushtool/straw2.txt
@@ -31,7 +31,7 @@ default default {
 
 # rules
 rule replicated_ruleset {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/tree.template.final b/src/test/cli/crushtool/tree.template.final
index 6af0701113dce2b0a9677cde26e187d0393e80b9..82659058ee09253be8daa411bf33171917ea099a 100644 (file)
--- a/src/test/cli/crushtool/tree.template.final
+++ b/src/test/cli/crushtool/tree.template.final
@@ -40,7 +40,7 @@ cluster cluster0 {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -49,7 +49,7 @@ rule data {
        step emit
 }
 rule metadata {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10
@@ -58,7 +58,7 @@ rule metadata {
        step emit
 }
 rule rbd {
-       ruleset 2
+       id 2
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t
index e2370d18f87536017c9405b9880fb1f55b6263e7..e352aba4f1fe85c20efa41441ec970169c00ed10 100644 (file)
--- a/src/test/cli/osdmaptool/create-print.t
+++ b/src/test/cli/osdmaptool/create-print.t
@@ -61,7 +61,7 @@
   
   # rules
   rule replicated_rule {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)

diff --git a/src/test/cli/osdmaptool/create-racks.t b/src/test/cli/osdmaptool/create-racks.t
index 7fdd5cc82ce37eada8780783a9dcbfa4871a09d6..21f871b7bfaafab325d90ada5de6ecbeda793424 100644 (file)
--- a/src/test/cli/osdmaptool/create-racks.t
+++ b/src/test/cli/osdmaptool/create-racks.t
@@ -769,7 +769,7 @@
   
   # rules
   rule replicated_rule {
-  \truleset 0 (esc)
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)

diff --git a/src/test/crush/crush-choose-args-expected-one-more-0.txt b/src/test/crush/crush-choose-args-expected-one-more-0.txt
index 0d61ec1193d86df9f349eb93defaf837aef94faf..2154da2d2fdae56cfaf31c0c63e45958ea279653 100644 (file)
--- a/src/test/crush/crush-choose-args-expected-one-more-0.txt
+++ b/src/test/crush/crush-choose-args-expected-one-more-0.txt
@@ -44,7 +44,7 @@ root default {
 
 # rules
 rule replicated_rule {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/crush/crush-choose-args-expected-one-more-3.txt b/src/test/crush/crush-choose-args-expected-one-more-3.txt
index 8031143d8595a3469ca0a4e5a7a8df6fe0029c86..53cc3d11900ec10a524ba6b79c12dcc7a442e5ab 100644 (file)
--- a/src/test/crush/crush-choose-args-expected-one-more-3.txt
+++ b/src/test/crush/crush-choose-args-expected-one-more-3.txt
@@ -44,7 +44,7 @@ root default {
 
 # rules
 rule replicated_rule {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10