X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Ftest%2Fcli%2Fcrushtool%2Farg-order-checks.t;h=bf9ab0c4dd20476780f5f7eb6f7c1715a1ab946c;hb=31f18b776d001752a193a7cec8bb49033c1a904c;hp=5c8b6ab02780b0f7a131cb6998ae661a15e43127;hpb=40152f1e46a80b3405e5558a442ee632198dfd24;p=ceph.git

diff --git a/ceph/src/test/cli/crushtool/arg-order-checks.t b/ceph/src/test/cli/crushtool/arg-order-checks.t
index 5c8b6ab02..bf9ab0c4d 100644
--- a/ceph/src/test/cli/crushtool/arg-order-checks.t
+++ b/ceph/src/test/cli/crushtool/arg-order-checks.t
@@ -4,7 +4,7 @@
   tunable straw_calc_version 1
 # build then reweight-item then tree
   $ map="$TESTDIR/foo"
-  $ crushtool --outfn "$map" --build --set-chooseleaf-vary-r 0 --num_osds 25 node straw 5 rack straw 1 root straw 0 --reweight-item osd.2 99 -o "$map" --tree
+  $ crushtool --outfn "$map" --build --set-chooseleaf-vary-r 0 --set-chooseleaf-stable 0 --num_osds 25 node straw 5 rack straw 1 root straw 0 --reweight-item osd.2 99 -o "$map" --tree
   crushtool reweighting item osd.2 to 99
   ID\tWEIGHT\tTYPE NAME (esc)
   -11\t123.00000\troot root (esc)
@@ -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 <file>' 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)