From abad4772e07a071b00df0a75f7b55f55dc43eb67 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 20 Jun 2017 17:45:59 -0400 Subject: [PATCH] osd: replicated_ruleset -> replicated_rule Signed-off-by: Sage Weil --- qa/workunits/mon/crush_ops.sh | 2 +- qa/workunits/rest/test.py | 2 +- src/osd/OSDMap.cc | 2 +- src/test/cli/crushtool/arg-order-checks.t | 84 +++++++++---------- src/test/cli/crushtool/build.t | 2 +- src/test/cli/osdmaptool/create-print.t | 2 +- src/test/cli/osdmaptool/create-racks.t | 2 +- src/test/cli/osdmaptool/crush.t | 2 +- .../crush-choose-args-expected-one-more-0.txt | 2 +- .../crush-choose-args-expected-one-more-3.txt | 2 +- src/test/mon/osd-crush.sh | 2 +- src/test/mon/osd-pool-create.sh | 4 +- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/qa/workunits/mon/crush_ops.sh b/qa/workunits/mon/crush_ops.sh index 80c58ca7522..11891480a90 100755 --- a/qa/workunits/mon/crush_ops.sh +++ b/qa/workunits/mon/crush_ops.sh @@ -26,7 +26,7 @@ ceph osd crush rule rm foo # idempotent ceph osd crush rule rm bar # can't delete in-use rules, tho: -expect_false ceph osd crush rule rm replicated_ruleset +expect_false ceph osd crush rule rm replicated_rule # build a simple map expect_false ceph osd crush add-bucket foo osd diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py index 919b811130a..565873e5182 100755 --- a/qa/workunits/rest/test.py +++ b/qa/workunits/rest/test.py @@ -419,6 +419,6 @@ if __name__ == '__main__': assert(r.myjson['output']['size'] == 2) r = expect('osd/pool/get.json?pool=rbd&var=crush_rule', 'GET', 200, 'json') - assert(r.myjson['output']['crush_rule'] == 0) + assert(r.myjson['output']['crush_rule'] == "replicated_rule") print('OK') diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 2d88f91d4bc..594ff82fae2 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -3467,7 +3467,7 @@ int OSDMap::build_simple_crush_rules( int r; r = crush.add_simple_rule_at( - "replicated_ruleset", 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/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t index 3b4baf7fb74..bf9ab0c4dd2 100644 --- a/src/test/cli/crushtool/arg-order-checks.t +++ b/src/test/cli/crushtool/arg-order-checks.t @@ -189,7 +189,7 @@ } # rules - rule replicated_ruleset { + rule replicated_rule { \truleset 0 (esc) \ttype replicated (esc) \tmin_size 1 (esc) @@ -202,8 +202,8 @@ # end crush map # tunables before reweight $ crushtool -i "$map" --set-straw-calc-version 0 --reweight --test --show-utilization --max-x 100 --min-x 1 - rule 0 (replicated_ruleset), x = 1..100, numrep = 1..10 - rule 0 (replicated_ruleset) num_rep 1 result size == 1:\t100/100 (esc) + rule 0 (replicated_rule), x = 1..100, numrep = 1..10 + rule 0 (replicated_rule) num_rep 1 result size == 1:\t100/100 (esc) device 0:\t\t stored : 4\t expected : 4 (esc) device 1:\t\t stored : 4\t expected : 4 (esc) device 2:\t\t stored : 40\t expected : 4 (esc) @@ -225,7 +225,7 @@ device 22:\t\t stored : 2\t expected : 4 (esc) device 23:\t\t stored : 2\t expected : 4 (esc) device 24:\t\t stored : 2\t expected : 4 (esc) - rule 0 (replicated_ruleset) num_rep 2 result size == 2:\t100/100 (esc) + rule 0 (replicated_rule) num_rep 2 result size == 2:\t100/100 (esc) device 0:\t\t stored : 6\t expected : 8 (esc) device 1:\t\t stored : 6\t expected : 8 (esc) device 2:\t\t stored : 60\t expected : 8 (esc) @@ -251,7 +251,7 @@ device 22:\t\t stored : 4\t expected : 8 (esc) device 23:\t\t stored : 5\t expected : 8 (esc) device 24:\t\t stored : 6\t expected : 8 (esc) - rule 0 (replicated_ruleset) num_rep 3 result size == 3:\t100/100 (esc) + rule 0 (replicated_rule) num_rep 3 result size == 3:\t100/100 (esc) device 0:\t\t stored : 8\t expected : 12 (esc) device 1:\t\t stored : 6\t expected : 12 (esc) device 2:\t\t stored : 69\t expected : 12 (esc) @@ -277,7 +277,7 @@ device 22:\t\t stored : 15\t expected : 12 (esc) device 23:\t\t stored : 8\t expected : 12 (esc) device 24:\t\t stored : 11\t expected : 12 (esc) - rule 0 (replicated_ruleset) num_rep 4 result size == 4:\t100/100 (esc) + rule 0 (replicated_rule) num_rep 4 result size == 4:\t100/100 (esc) device 0:\t\t stored : 8\t expected : 16 (esc) device 1:\t\t stored : 6\t expected : 16 (esc) device 2:\t\t stored : 72\t expected : 16 (esc) @@ -303,8 +303,8 @@ device 22:\t\t stored : 20\t expected : 16 (esc) device 23:\t\t stored : 10\t expected : 16 (esc) device 24:\t\t stored : 15\t expected : 16 (esc) - rule 0 (replicated_ruleset) num_rep 5 result size == 4:\t3/100 (esc) - rule 0 (replicated_ruleset) num_rep 5 result size == 5:\t97/100 (esc) + rule 0 (replicated_rule) num_rep 5 result size == 4:\t3/100 (esc) + rule 0 (replicated_rule) num_rep 5 result size == 5:\t97/100 (esc) device 0:\t\t stored : 8\t expected : 20 (esc) device 1:\t\t stored : 6\t expected : 20 (esc) device 2:\t\t stored : 74\t expected : 20 (esc) @@ -330,8 +330,8 @@ device 22:\t\t stored : 25\t expected : 20 (esc) device 23:\t\t stored : 13\t expected : 20 (esc) device 24:\t\t stored : 18\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 6 result size == 4:\t3/100 (esc) - rule 0 (replicated_ruleset) num_rep 6 result size == 5:\t97/100 (esc) + rule 0 (replicated_rule) num_rep 6 result size == 4:\t3/100 (esc) + rule 0 (replicated_rule) num_rep 6 result size == 5:\t97/100 (esc) device 0:\t\t stored : 8\t expected : 20 (esc) device 1:\t\t stored : 6\t expected : 20 (esc) device 2:\t\t stored : 74\t expected : 20 (esc) @@ -357,8 +357,8 @@ device 22:\t\t stored : 25\t expected : 20 (esc) device 23:\t\t stored : 13\t expected : 20 (esc) device 24:\t\t stored : 18\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 7 result size == 4:\t3/100 (esc) - rule 0 (replicated_ruleset) num_rep 7 result size == 5:\t97/100 (esc) + rule 0 (replicated_rule) num_rep 7 result size == 4:\t3/100 (esc) + rule 0 (replicated_rule) num_rep 7 result size == 5:\t97/100 (esc) device 0:\t\t stored : 8\t expected : 20 (esc) device 1:\t\t stored : 6\t expected : 20 (esc) device 2:\t\t stored : 74\t expected : 20 (esc) @@ -384,8 +384,8 @@ device 22:\t\t stored : 25\t expected : 20 (esc) device 23:\t\t stored : 13\t expected : 20 (esc) device 24:\t\t stored : 18\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 8 result size == 4:\t3/100 (esc) - rule 0 (replicated_ruleset) num_rep 8 result size == 5:\t97/100 (esc) + rule 0 (replicated_rule) num_rep 8 result size == 4:\t3/100 (esc) + rule 0 (replicated_rule) num_rep 8 result size == 5:\t97/100 (esc) device 0:\t\t stored : 8\t expected : 20 (esc) device 1:\t\t stored : 6\t expected : 20 (esc) device 2:\t\t stored : 74\t expected : 20 (esc) @@ -411,8 +411,8 @@ device 22:\t\t stored : 25\t expected : 20 (esc) device 23:\t\t stored : 13\t expected : 20 (esc) device 24:\t\t stored : 18\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 9 result size == 4:\t2/100 (esc) - rule 0 (replicated_ruleset) num_rep 9 result size == 5:\t98/100 (esc) + rule 0 (replicated_rule) num_rep 9 result size == 4:\t2/100 (esc) + rule 0 (replicated_rule) num_rep 9 result size == 5:\t98/100 (esc) device 0:\t\t stored : 8\t expected : 20 (esc) device 1:\t\t stored : 6\t expected : 20 (esc) device 2:\t\t stored : 74\t expected : 20 (esc) @@ -438,8 +438,8 @@ device 22:\t\t stored : 25\t expected : 20 (esc) device 23:\t\t stored : 13\t expected : 20 (esc) device 24:\t\t stored : 18\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 10 result size == 4:\t2/100 (esc) - rule 0 (replicated_ruleset) num_rep 10 result size == 5:\t98/100 (esc) + rule 0 (replicated_rule) num_rep 10 result size == 4:\t2/100 (esc) + rule 0 (replicated_rule) num_rep 10 result size == 5:\t98/100 (esc) device 0:\t\t stored : 8\t expected : 20 (esc) device 1:\t\t stored : 6\t expected : 20 (esc) device 2:\t\t stored : 74\t expected : 20 (esc) @@ -467,8 +467,8 @@ device 24:\t\t stored : 18\t expected : 20 (esc) crushtool successfully built or modified map. Use '-o ' to write it out. $ crushtool -i "$map" --set-straw-calc-version 1 --reweight --test --show-utilization --max-x 100 --min-x 1 - rule 0 (replicated_ruleset), x = 1..100, numrep = 1..10 - rule 0 (replicated_ruleset) num_rep 1 result size == 1:\t100/100 (esc) + rule 0 (replicated_rule), x = 1..100, numrep = 1..10 + rule 0 (replicated_rule) num_rep 1 result size == 1:\t100/100 (esc) device 1:\t\t stored : 1\t expected : 4 (esc) device 2:\t\t stored : 75\t expected : 4 (esc) device 3:\t\t stored : 2\t expected : 4 (esc) @@ -483,7 +483,7 @@ device 20:\t\t stored : 2\t expected : 4 (esc) device 22:\t\t stored : 1\t expected : 4 (esc) device 23:\t\t stored : 1\t expected : 4 (esc) - rule 0 (replicated_ruleset) num_rep 2 result size == 2:\t100/100 (esc) + rule 0 (replicated_rule) num_rep 2 result size == 2:\t100/100 (esc) device 0:\t\t stored : 1\t expected : 8 (esc) device 1:\t\t stored : 1\t expected : 8 (esc) device 2:\t\t stored : 95\t expected : 8 (esc) @@ -508,7 +508,7 @@ device 22:\t\t stored : 6\t expected : 8 (esc) device 23:\t\t stored : 5\t expected : 8 (esc) device 24:\t\t stored : 8\t expected : 8 (esc) - rule 0 (replicated_ruleset) num_rep 3 result size == 3:\t100/100 (esc) + rule 0 (replicated_rule) num_rep 3 result size == 3:\t100/100 (esc) device 0:\t\t stored : 1\t expected : 12 (esc) device 1:\t\t stored : 1\t expected : 12 (esc) device 2:\t\t stored : 95\t expected : 12 (esc) @@ -534,8 +534,8 @@ device 22:\t\t stored : 11\t expected : 12 (esc) device 23:\t\t stored : 11\t expected : 12 (esc) device 24:\t\t stored : 11\t expected : 12 (esc) - rule 0 (replicated_ruleset) num_rep 4 result size == 3:\t3/100 (esc) - rule 0 (replicated_ruleset) num_rep 4 result size == 4:\t97/100 (esc) + rule 0 (replicated_rule) num_rep 4 result size == 3:\t3/100 (esc) + rule 0 (replicated_rule) num_rep 4 result size == 4:\t97/100 (esc) device 0:\t\t stored : 1\t expected : 16 (esc) device 1:\t\t stored : 1\t expected : 16 (esc) device 2:\t\t stored : 95\t expected : 16 (esc) @@ -561,9 +561,9 @@ device 22:\t\t stored : 14\t expected : 16 (esc) device 23:\t\t stored : 13\t expected : 16 (esc) device 24:\t\t stored : 14\t expected : 16 (esc) - rule 0 (replicated_ruleset) num_rep 5 result size == 3:\t3/100 (esc) - rule 0 (replicated_ruleset) num_rep 5 result size == 4:\t43/100 (esc) - rule 0 (replicated_ruleset) num_rep 5 result size == 5:\t54/100 (esc) + rule 0 (replicated_rule) num_rep 5 result size == 3:\t3/100 (esc) + rule 0 (replicated_rule) num_rep 5 result size == 4:\t43/100 (esc) + rule 0 (replicated_rule) num_rep 5 result size == 5:\t54/100 (esc) device 0:\t\t stored : 1\t expected : 20 (esc) device 1:\t\t stored : 1\t expected : 20 (esc) device 2:\t\t stored : 95\t expected : 20 (esc) @@ -589,9 +589,9 @@ device 22:\t\t stored : 16\t expected : 20 (esc) device 23:\t\t stored : 15\t expected : 20 (esc) device 24:\t\t stored : 16\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 6 result size == 3:\t2/100 (esc) - rule 0 (replicated_ruleset) num_rep 6 result size == 4:\t43/100 (esc) - rule 0 (replicated_ruleset) num_rep 6 result size == 5:\t55/100 (esc) + rule 0 (replicated_rule) num_rep 6 result size == 3:\t2/100 (esc) + rule 0 (replicated_rule) num_rep 6 result size == 4:\t43/100 (esc) + rule 0 (replicated_rule) num_rep 6 result size == 5:\t55/100 (esc) device 0:\t\t stored : 1\t expected : 20 (esc) device 1:\t\t stored : 1\t expected : 20 (esc) device 2:\t\t stored : 95\t expected : 20 (esc) @@ -617,9 +617,9 @@ device 22:\t\t stored : 16\t expected : 20 (esc) device 23:\t\t stored : 16\t expected : 20 (esc) device 24:\t\t stored : 16\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 7 result size == 3:\t2/100 (esc) - rule 0 (replicated_ruleset) num_rep 7 result size == 4:\t42/100 (esc) - rule 0 (replicated_ruleset) num_rep 7 result size == 5:\t56/100 (esc) + rule 0 (replicated_rule) num_rep 7 result size == 3:\t2/100 (esc) + rule 0 (replicated_rule) num_rep 7 result size == 4:\t42/100 (esc) + rule 0 (replicated_rule) num_rep 7 result size == 5:\t56/100 (esc) device 0:\t\t stored : 1\t expected : 20 (esc) device 1:\t\t stored : 1\t expected : 20 (esc) device 2:\t\t stored : 95\t expected : 20 (esc) @@ -645,9 +645,9 @@ device 22:\t\t stored : 16\t expected : 20 (esc) device 23:\t\t stored : 16\t expected : 20 (esc) device 24:\t\t stored : 16\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 8 result size == 3:\t2/100 (esc) - rule 0 (replicated_ruleset) num_rep 8 result size == 4:\t40/100 (esc) - rule 0 (replicated_ruleset) num_rep 8 result size == 5:\t58/100 (esc) + rule 0 (replicated_rule) num_rep 8 result size == 3:\t2/100 (esc) + rule 0 (replicated_rule) num_rep 8 result size == 4:\t40/100 (esc) + rule 0 (replicated_rule) num_rep 8 result size == 5:\t58/100 (esc) device 0:\t\t stored : 1\t expected : 20 (esc) device 1:\t\t stored : 1\t expected : 20 (esc) device 2:\t\t stored : 95\t expected : 20 (esc) @@ -673,9 +673,9 @@ device 22:\t\t stored : 16\t expected : 20 (esc) device 23:\t\t stored : 16\t expected : 20 (esc) device 24:\t\t stored : 16\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 9 result size == 3:\t2/100 (esc) - rule 0 (replicated_ruleset) num_rep 9 result size == 4:\t37/100 (esc) - rule 0 (replicated_ruleset) num_rep 9 result size == 5:\t61/100 (esc) + rule 0 (replicated_rule) num_rep 9 result size == 3:\t2/100 (esc) + rule 0 (replicated_rule) num_rep 9 result size == 4:\t37/100 (esc) + rule 0 (replicated_rule) num_rep 9 result size == 5:\t61/100 (esc) device 0:\t\t stored : 1\t expected : 20 (esc) device 1:\t\t stored : 1\t expected : 20 (esc) device 2:\t\t stored : 95\t expected : 20 (esc) @@ -701,9 +701,9 @@ device 22:\t\t stored : 16\t expected : 20 (esc) device 23:\t\t stored : 16\t expected : 20 (esc) device 24:\t\t stored : 16\t expected : 20 (esc) - rule 0 (replicated_ruleset) num_rep 10 result size == 3:\t2/100 (esc) - rule 0 (replicated_ruleset) num_rep 10 result size == 4:\t36/100 (esc) - rule 0 (replicated_ruleset) num_rep 10 result size == 5:\t62/100 (esc) + rule 0 (replicated_rule) num_rep 10 result size == 3:\t2/100 (esc) + rule 0 (replicated_rule) num_rep 10 result size == 4:\t36/100 (esc) + rule 0 (replicated_rule) num_rep 10 result size == 5:\t62/100 (esc) device 0:\t\t stored : 1\t expected : 20 (esc) device 1:\t\t stored : 1\t expected : 20 (esc) device 2:\t\t stored : 95\t expected : 20 (esc) diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t index a941307f005..bebfd7fdcb7 100644 --- a/src/test/cli/crushtool/build.t +++ b/src/test/cli/crushtool/build.t @@ -51,7 +51,7 @@ } # rules - rule replicated_ruleset { + rule replicated_rule { \truleset 0 (esc) \ttype replicated (esc) \tmin_size 1 (esc) diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t index 4d0007b0f86..3fc5fe00b2c 100644 --- a/src/test/cli/osdmaptool/create-print.t +++ b/src/test/cli/osdmaptool/create-print.t @@ -60,7 +60,7 @@ } # rules - rule replicated_ruleset { + rule replicated_rule { \truleset 0 (esc) \ttype replicated (esc) \tmin_size 1 (esc) diff --git a/src/test/cli/osdmaptool/create-racks.t b/src/test/cli/osdmaptool/create-racks.t index cae0ed28f00..567a1680f97 100644 --- a/src/test/cli/osdmaptool/create-racks.t +++ b/src/test/cli/osdmaptool/create-racks.t @@ -768,7 +768,7 @@ } # rules - rule replicated_ruleset { + rule replicated_rule { \truleset 0 (esc) \ttype replicated (esc) \tmin_size 1 (esc) diff --git a/src/test/cli/osdmaptool/crush.t b/src/test/cli/osdmaptool/crush.t index d2f27ef736d..8e77c7a9a98 100644 --- a/src/test/cli/osdmaptool/crush.t +++ b/src/test/cli/osdmaptool/crush.t @@ -6,5 +6,5 @@ osdmaptool: exported crush map to oc $ osdmaptool --import-crush oc myosdmap osdmaptool: osdmap file 'myosdmap' - osdmaptool: imported 492 byte crush map from oc + osdmaptool: imported 489 byte crush map from oc osdmaptool: writing epoch 3 to myosdmap 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 c82edaf7808..0d61ec1193d 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 @@ -43,7 +43,7 @@ root default { } # rules -rule replicated_ruleset { +rule replicated_rule { ruleset 0 type replicated min_size 1 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 cc7b2fc4875..8031143d859 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 @@ -43,7 +43,7 @@ root default { } # rules -rule replicated_ruleset { +rule replicated_rule { ruleset 0 type replicated min_size 1 diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh index f4ba7de99d9..ac704e0f5b9 100755 --- a/src/test/mon/osd-crush.sh +++ b/src/test/mon/osd-crush.sh @@ -40,7 +40,7 @@ function TEST_crush_rule_create_simple() { run_mon $dir a || return 1 - ceph --format xml osd crush rule dump replicated_ruleset | \ + ceph --format xml osd crush rule dump replicated_rule | \ egrep 'take[^<]+default' | \ grep 'choose_firstn0osd' || return 1 local ruleset=ruleset0 diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh index b879d9de0be..53733abf804 100755 --- a/src/test/mon/osd-pool-create.sh +++ b/src/test/mon/osd-pool-create.sh @@ -174,9 +174,9 @@ function TEST_erasure_code_pool_lrc() { function TEST_replicated_pool() { local dir=$1 run_mon $dir a || return 1 - ceph osd pool create replicated 12 12 replicated replicated_ruleset 2>&1 | \ + ceph osd pool create replicated 12 12 replicated replicated_rule 2>&1 | \ grep "pool 'replicated' created" || return 1 - ceph osd pool create replicated 12 12 replicated replicated_ruleset 2>&1 | \ + ceph osd pool create replicated 12 12 replicated replicated_rule 2>&1 | \ grep 'already exists' || return 1 # default is replicated ceph osd pool create replicated1 12 12 2>&1 | \ -- 2.39.5