From f9a095deb1e74642d88bc9015684b0be113cc5f9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 18 Jul 2017 14:58:19 -0400 Subject: [PATCH] crush: s/ruleset/id/ in decompiled output Moving away from the 'ruleset' terminology. Signed-off-by: Sage Weil --- src/crush/CrushCompiler.cc | 5 ++++- src/crush/grammar.h | 2 +- src/test/cli/crushtool/add-item.t | 14 +++++++------- src/test/cli/crushtool/arg-order-checks.t | 2 +- src/test/cli/crushtool/build.t | 2 +- src/test/cli/crushtool/choose-args.crush | 2 +- src/test/cli/crushtool/choose-args.t | 2 +- src/test/cli/crushtool/device-class.crush | 6 +++--- src/test/cli/crushtool/multitype.after | 6 +++--- src/test/cli/crushtool/need_tree_order.crush | 2 +- src/test/cli/crushtool/rules.t | 8 ++++---- src/test/cli/crushtool/set-choose.crushmap.txt | 12 ++++++------ src/test/cli/crushtool/simple.template.adj.three | 6 +++--- src/test/cli/crushtool/simple.template.adj.two | 6 +++--- src/test/cli/crushtool/simple.template.five | 6 +++--- src/test/cli/crushtool/simple.template.four | 6 +++--- .../crushtool/simple.template.multitree.reweighted | 6 +++--- src/test/cli/crushtool/simple.template.two | 6 +++--- src/test/cli/crushtool/straw2.txt | 2 +- src/test/cli/crushtool/tree.template.final | 6 +++--- src/test/cli/osdmaptool/create-print.t | 2 +- src/test/cli/osdmaptool/create-racks.t | 2 +- .../crush-choose-args-expected-one-more-0.txt | 2 +- .../crush-choose-args-expected-one-more-3.txt | 2 +- 24 files changed, 59 insertions(+), 56 deletions(-) diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc index b7c7a389047a9..af0dd875848c4 100644 --- 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 8fb28c877a40d..42a6068b362ba 100644 --- a/src/crush/grammar.h +++ b/src/crush/grammar.h @@ -161,7 +161,7 @@ struct crush_grammar : public 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 261715ca6cafb..17127db590f63 100644 --- 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 bf9ab0c4dd204..9f27dd9432aba 100644 --- 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 bebfd7fdcb7ed..eadd969428113 100644 --- 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 2ed6c2315d0d3..332f2e4f9a710 100644 --- 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 6f1b47274acaf..dbe8e5bba7e6c 100644 --- 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 702000638c1f7..a3c1a1f0eab68 100644 --- 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 9c7da0aad6ca4..15bfd9af37458 100644 --- 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 d7da94e977cc1..4625edd72bbc5 100644 --- 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 bda3c13a44445..e90ddbcf7cbfe 100644 --- 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 bc890e0214634..8530436c02630 100644 --- 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 fca0fe162f437..2532e88a4c1af 100644 --- 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 21c29a3afefc8..7c911c45f3127 100644 --- 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 240e81de021d8..6f2c5f43f8ef0 100644 --- 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 aa16bbdedc327..31dcecdca4ad4 100644 --- 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 caad7ab771ab2..b337d28f7c62e 100644 --- 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 9a3aee7349dde..099ff70c1f23d 100644 --- 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 0928aa5b92975..0531c7ad197bc 100644 --- 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 6af0701113dce..82659058ee092 100644 --- 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 e2370d18f8753..e352aba4f1fe8 100644 --- 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 7fdd5cc82ce37..21f871b7bfaaf 100644 --- 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 0d61ec1193d86..2154da2d2fdae 100644 --- 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 8031143d8595a..53cc3d11900ec 100644 --- 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 -- 2.39.5