test/cli/crushtool: use 'id' instead of 'ruleset' in crush inputs

The 'ruleset' syntax is super-old and misleading.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/test/cli/crushtool/bad-mappings.crushmap.txt b/src/test/cli/crushtool/bad-mappings.crushmap.txt
index 21b5981914c562adea99de48d095d84b2d20ce1c..f2bb4da574393eadfc6727ef238b22979c901170 100644 (file)
--- a/src/test/cli/crushtool/bad-mappings.crushmap.txt
+++ b/src/test/cli/crushtool/bad-mappings.crushmap.txt
@@ -19,7 +19,7 @@ domain root {
 }
 
 rule rule-firstn {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -29,7 +29,7 @@ rule rule-firstn {
 }
 
 rule rule-indep {
-       ruleset 1
+       id 1
        type erasure
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index f50b64084c12b8cc706d4b1f693d2cfd7d715c9e..c6aff9d5b635dcf96e22c9eb6fda6349a97a615a 100644 (file)
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -14,14 +14,14 @@
 # display a warning if there is more than one root
 #
   $ crushtool --outfn "$map" --build --num_osds 5 node straw 2 rack straw 1 
-  The crush rulesets will use the root rack0 (re)
+  The crush rules will use the root rack0 (re)
   and ignore the others.
   There are 3 roots, they can be
   grouped into a single root by appending something like:
     root straw 0
   
 #
-# crush rulesets are generated using the OSDMap helpers
+# crush rules are generated using the OSDMap helpers
 #
   $ CEPH_ARGS="--debug-crush 0" crushtool --outfn "$map" --set-straw-calc-version 0 --build --num_osds 1 root straw 0 --set-chooseleaf-stable 0
   $ crushtool -o "$map.txt" -d "$map"

diff --git a/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt b/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt
index 4be115108b9724d9288011cd814d282d1ff68c57..b041aa490338ab17c96dde2fbc48bb3c9b3951ad 100644 (file)
--- a/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt
+++ b/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt
@@ -19,7 +19,7 @@ host host0 {
 }
 
 rule rule-r0 {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 3
@@ -29,7 +29,7 @@ rule rule-r0 {
 }
 
 rule rule-r1 {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 1
@@ -39,7 +39,7 @@ rule rule-r1 {
 }
 
 rule rule-r2 {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 2
@@ -49,7 +49,7 @@ rule rule-r2 {
 }
 
 rule rule-r3 {
-       ruleset 0
+       id 0
        type replicated
        min_size 2
        max_size 3
@@ -59,7 +59,7 @@ rule rule-r3 {
 }
 
 rule rule-r4 {
-       ruleset 0
+       id 0
        type replicated
        min_size 4
        max_size 5
@@ -69,7 +69,7 @@ rule rule-r4 {
 }
 
 rule rule-e0 {
-       ruleset 0
+       id 0
        type erasure
        min_size 1
        max_size 10
@@ -79,7 +79,7 @@ rule rule-e0 {
 }
 
 rule rule-e1 {
-       ruleset 1
+       id 1
        type erasure
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/empty-default.cushmap.txt b/src/test/cli/crushtool/empty-default.cushmap.txt
index fc24d17aed9d1c10d78f5265d1a37f241ad0add0..f52a2cb1de7307866c74e497e40fea52dc581573 100644 (file)
--- a/src/test/cli/crushtool/empty-default.cushmap.txt
+++ b/src/test/cli/crushtool/empty-default.cushmap.txt
@@ -29,8 +29,8 @@ root default {
 }
 
 # rules
-rule replicated_ruleset {
-    ruleset 0
+rule replicated_rule {
+    id 0
     type replicated
     min_size 1
     max_size 10

diff --git a/src/test/cli/crushtool/missing-bucket.crushmap.txt b/src/test/cli/crushtool/missing-bucket.crushmap.txt
index 6d40af3297dc304b60fa837c3a8e8737497c49b7..80f44cd7ae04bf3b6b525c6841c941d9c73910cf 100644 (file)
--- a/src/test/cli/crushtool/missing-bucket.crushmap.txt
+++ b/src/test/cli/crushtool/missing-bucket.crushmap.txt
@@ -19,7 +19,7 @@ domain root {
 }
 
 rule rule-bad {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -29,7 +29,7 @@ rule rule-bad {
 }
 
 rule rule-good {
-       ruleset 1
+       id 1
        type erasure
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/multitype.before b/src/test/cli/crushtool/multitype.before
index 2727dcae1585a60163f40cd2cc54eebe7c9ac237..a787bdc3407a9360a3747eac21f1ddaa3755b5c0 100644 (file)
--- a/src/test/cli/crushtool/multitype.before
+++ b/src/test/cli/crushtool/multitype.before
@@ -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/output-csv.t b/src/test/cli/crushtool/output-csv.t
index ad99597436a209f1b0c7e172610ad73ae7c678e7..0769dacd52d7533d66aa00f69cef1b2ed82aa629 100644 (file)
--- a/src/test/cli/crushtool/output-csv.t
+++ b/src/test/cli/crushtool/output-csv.t
@@ -1,4 +1,4 @@
-# first test that CSV files are created for each ruleset 
+# first test that CSV files are created for each rule
 $ crushtool -i five-devices.crushmap --test --num-rep 1 --min-x 0 --max-x 9 --output-csv
 $ if [ ! -f data-absolute_weights.csv ]; then echo FAIL; fi
 $ if [ ! -f data-batch_device_expected_utilization_all.csv ]; then echo FAIL; fi 

diff --git a/src/test/cli/crushtool/rules.txt b/src/test/cli/crushtool/rules.txt
index a8be9e95867398c7f818373a60569b248dec8b52..4844cf8911e8cfdecae5849e92b6d3b8f6bbefd7 100644 (file)
--- a/src/test/cli/crushtool/rules.txt
+++ b/src/test/cli/crushtool/rules.txt
@@ -42,7 +42,7 @@ root default {
 
 # rules
 rule data {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/cli/crushtool/show-choose-tries.txt b/src/test/cli/crushtool/show-choose-tries.txt
index 7826fec36d9b3d1af467498ac6e7ab12cac912f1..9a961c8c81e0e4328b1234e9f8f20ea863c002ca 100644 (file)
--- a/src/test/cli/crushtool/show-choose-tries.txt
+++ b/src/test/cli/crushtool/show-choose-tries.txt
@@ -24,8 +24,8 @@ root root {
        item device2 weight 1.00000
 }
 
-rule first_ruleset {
-       ruleset 0
+rule first_rule {
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -34,8 +34,8 @@ rule first_ruleset {
        step emit
 }
 
-rule indep_ruleset {
-    ruleset 1
+rule indep_rule {
+    id 1
     type erasure
     min_size 3
     max_size 20

diff --git a/src/test/cli/crushtool/simple.template.adj.one b/src/test/cli/crushtool/simple.template.adj.one
index ff268e13f26f54bced1fb6d3afb727702f0b78dd..94c243de76d75e36533d9780db08221d27ad14bb 100644 (file)
--- a/src/test/cli/crushtool/simple.template.adj.one
+++ b/src/test/cli/crushtool/simple.template.adj.one
@@ -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 b/src/test/cli/crushtool/simple.template.multitree
index 6cf1b2177922c1639a602c2d09f39ac21988ab12..05d18b2761d78ca2ef555a328ba2258588fa602d 100644 (file)
--- a/src/test/cli/crushtool/simple.template.multitree
+++ b/src/test/cli/crushtool/simple.template.multitree
@@ -40,7 +40,7 @@ cluster cluster1 {
 
 # 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/crushtool/simple.template.one b/src/test/cli/crushtool/simple.template.one
index 22acd02d2b429fbb81a66434bbfb71e591448eab..4dcb1505d85638a0b380f27142859a5180f018b1 100644 (file)
--- a/src/test/cli/crushtool/simple.template.one
+++ b/src/test/cli/crushtool/simple.template.one
@@ -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/simple.template.three b/src/test/cli/crushtool/simple.template.three
index 22acd02d2b429fbb81a66434bbfb71e591448eab..4dcb1505d85638a0b380f27142859a5180f018b1 100644 (file)
--- a/src/test/cli/crushtool/simple.template.three
+++ b/src/test/cli/crushtool/simple.template.three
@@ -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 65755e4d14e16aebfef64a368fe2cd828e315323..754f45e10b483a53161020229c54a2499239c65d 100644 (file)
--- a/src/test/cli/crushtool/straw2.txt
+++ b/src/test/cli/crushtool/straw2.txt
@@ -30,7 +30,7 @@ default default {
 }
 
 # rules
-rule replicated_ruleset {
+rule replicated_rule {
        id 0
        type replicated
        min_size 1

diff --git a/src/test/cli/crushtool/test-map-firstn-indep.txt b/src/test/cli/crushtool/test-map-firstn-indep.txt
index 8fd2ea9eced44521270cd27339bdba048f0fe6b1..59bc09811b6d068e4d78b5d1f3004f971125f974 100644 (file)
--- a/src/test/cli/crushtool/test-map-firstn-indep.txt
+++ b/src/test/cli/crushtool/test-map-firstn-indep.txt
@@ -419,7 +419,7 @@ default root {
 
 # rules
 rule myrule {
-       ruleset 0
+       id 0
        type replicated
        min_size 1
        max_size 10
@@ -430,7 +430,7 @@ rule myrule {
 }
 
 rule myrule1 {
-       ruleset 1
+       id 1
        type replicated
        min_size 1
        max_size 10

diff --git a/src/test/crush/crush_weights.sh b/src/test/crush/crush_weights.sh
index 5b93f3a1afb5064c78ec2123ae1c73bf05c5d466..7aec52e87659bba3b2b91571541b6025c7a3bfa5 100755 (executable)
--- a/src/test/crush/crush_weights.sh
+++ b/src/test/crush/crush_weights.sh
@@ -33,7 +33,7 @@ domain root {
 }
 # rules
 rule data {
-    ruleset 0
+    id 0
     type replicated
     min_size 1
     max_size 10