test/cli: fix cli tests

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

diff --git a/src/test/cli/crushtool/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t
index 8ee193431cdb9803c8ac9c6930cd4500724ada14..5c8b6ab02780b0f7a131cb6998ae661a15e43127 100644 (file)
--- a/src/test/cli/crushtool/arg-order-checks.t
+++ b/src/test/cli/crushtool/arg-order-checks.t
@@ -50,6 +50,7 @@
   tunable choose_total_tries 50
   tunable chooseleaf_descend_once 1
   tunable straw_calc_version 1
+  tunable allowed_bucket_algs 54
   
   # devices
   device 0 osd.0

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index 5fa4b504eb4d34b6508cc6fbb046d2df92f97971..0a779f0f4f926d8625d99141e207498e5becb6f0 100644 (file)
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -32,6 +32,7 @@
   tunable choose_total_tries 50
   tunable chooseleaf_descend_once 1
   tunable chooseleaf_vary_r 1
+  tunable allowed_bucket_algs 54
   
   # devices
   device 0 osd.0

diff --git a/src/test/cli/osdmaptool/clobber.t b/src/test/cli/osdmaptool/clobber.t
index dd7e1756104ef756c3db64366f837453f5dbf408..5ca08e8dcd2915b3c41b0a883bcca5562b9c3332 100644 (file)
--- a/src/test/cli/osdmaptool/clobber.t
+++ b/src/test/cli/osdmaptool/clobber.t
@@ -22,6 +22,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
+  min_compat_client hammer 0.94
   
   pool 0 'rbd' replicated size 3 min_size 2 crush_ruleset 0 object_hash rjenkins pg_num 192 pgp_num 192 last_change 0 flags hashpspool stripe_width 0
   
@@ -46,6 +47,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
+  min_compat_client hammer 0.94
   
   pool 0 'rbd' replicated size 3 min_size 2 crush_ruleset 0 object_hash rjenkins pg_num 64 pgp_num 64 last_change 0 flags hashpspool stripe_width 0
   

diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t
index 32468a4a6fabd511c4c3853ba7a4139c02e0280c..81520af9ce582be5fbec4e4401e919ca8203b694 100644 (file)
--- a/src/test/cli/osdmaptool/create-print.t
+++ b/src/test/cli/osdmaptool/create-print.t
@@ -13,6 +13,7 @@
   tunable chooseleaf_descend_once 1
   tunable chooseleaf_vary_r 1
   tunable straw_calc_version 1
+  tunable allowed_bucket_algs 54
   
   # devices
   device 0 osd.0
@@ -36,7 +37,7 @@
   host localhost {
   \tid -2\t\t# do not change unnecessarily (esc)
   \t# weight 3.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.0 weight 1.000 (esc)
   \titem osd.1 weight 1.000 (esc)
@@ -45,14 +46,14 @@
   rack localrack {
   \tid -3\t\t# do not change unnecessarily (esc)
   \t# weight 3.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem localhost weight 3.000 (esc)
   }
   root default {
   \tid -1\t\t# do not change unnecessarily (esc)
   \t# weight 3.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem localrack weight 3.000 (esc)
   }
@@ -79,6 +80,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
+  min_compat_client hammer 0.94
   
   pool 0 'rbd' replicated size 3 min_size 2 crush_ruleset 0 object_hash rjenkins pg_num 192 pgp_num 192 last_change 0 flags hashpspool stripe_width 0
   

diff --git a/src/test/cli/osdmaptool/create-racks.t b/src/test/cli/osdmaptool/create-racks.t
index 0759698127d9b45fd86ee542655907f494cf02e0..a0443ffbb66c87d8d5184bbf49bcb3b9f89ce062 100644 (file)
--- a/src/test/cli/osdmaptool/create-racks.t
+++ b/src/test/cli/osdmaptool/create-racks.t
@@ -12,6 +12,7 @@
   tunable chooseleaf_descend_once 1
   tunable chooseleaf_vary_r 1
   tunable straw_calc_version 1
+  tunable allowed_bucket_algs 54
   
   # devices
   device 0 device0
@@ -271,7 +272,7 @@
   host cephstore5522 {
   \tid -2\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.1 weight 1.000 (esc)
   \titem osd.2 weight 1.000 (esc)
@@ -284,7 +285,7 @@
   host cephstore5523 {
   \tid -4\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.10 weight 1.000 (esc)
   \titem osd.11 weight 1.000 (esc)
@@ -297,7 +298,7 @@
   host cephstore6238 {
   \tid -8\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.113 weight 1.000 (esc)
   \titem osd.114 weight 1.000 (esc)
@@ -310,7 +311,7 @@
   host cephstore6240 {
   \tid -10\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.127 weight 1.000 (esc)
   \titem osd.128 weight 1.000 (esc)
@@ -323,7 +324,7 @@
   host cephstore6242 {
   \tid -12\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.141 weight 1.000 (esc)
   \titem osd.142 weight 1.000 (esc)
@@ -336,7 +337,7 @@
   host cephstore5524 {
   \tid -14\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.15 weight 1.000 (esc)
   \titem osd.16 weight 1.000 (esc)
@@ -349,7 +350,7 @@
   host cephstore6244 {
   \tid -15\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.155 weight 1.000 (esc)
   \titem osd.156 weight 1.000 (esc)
@@ -362,7 +363,7 @@
   host cephstore6246 {
   \tid -17\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.169 weight 1.000 (esc)
   \titem osd.170 weight 1.000 (esc)
@@ -375,7 +376,7 @@
   host cephstore6337 {
   \tid -19\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.183 weight 1.000 (esc)
   \titem osd.184 weight 1.000 (esc)
@@ -388,7 +389,7 @@
   host cephstore6341 {
   \tid -23\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.211 weight 1.000 (esc)
   \titem osd.212 weight 1.000 (esc)
@@ -401,7 +402,7 @@
   host cephstore6342 {
   \tid -24\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.218 weight 1.000 (esc)
   \titem osd.219 weight 1.000 (esc)
@@ -414,7 +415,7 @@
   host cephstore5525 {
   \tid -25\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.22 weight 1.000 (esc)
   \titem osd.23 weight 1.000 (esc)
@@ -427,7 +428,7 @@
   host cephstore6345 {
   \tid -27\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.232 weight 1.000 (esc)
   \titem osd.233 weight 1.000 (esc)
@@ -440,7 +441,7 @@
   host cephstore5526 {
   \tid -28\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.29 weight 1.000 (esc)
   \titem osd.30 weight 1.000 (esc)
@@ -453,7 +454,7 @@
   host cephstore5527 {
   \tid -29\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.36 weight 1.000 (esc)
   \titem osd.37 weight 1.000 (esc)
@@ -466,7 +467,7 @@
   host cephstore5529 {
   \tid -30\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.43 weight 1.000 (esc)
   \titem osd.44 weight 1.000 (esc)
@@ -479,7 +480,7 @@
   host cephstore5530 {
   \tid -31\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.50 weight 1.000 (esc)
   \titem osd.51 weight 1.000 (esc)
@@ -492,7 +493,7 @@
   rack irv-n2 {
   \tid -3\t\t# do not change unnecessarily (esc)
   \t# weight 119.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem cephstore5522 weight 7.000 (esc)
   \titem cephstore5523 weight 7.000 (esc)
@@ -515,7 +516,7 @@
   host cephstore6236 {
   \tid -5\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.100 weight 1.000 (esc)
   \titem osd.101 weight 1.000 (esc)
@@ -528,7 +529,7 @@
   host cephstore6237 {
   \tid -7\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.106 weight 1.000 (esc)
   \titem osd.107 weight 1.000 (esc)
@@ -541,7 +542,7 @@
   host cephstore6239 {
   \tid -9\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.120 weight 1.000 (esc)
   \titem osd.121 weight 1.000 (esc)
@@ -554,7 +555,7 @@
   host cephstore6241 {
   \tid -11\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.134 weight 1.000 (esc)
   \titem osd.135 weight 1.000 (esc)
@@ -567,7 +568,7 @@
   host cephstore6243 {
   \tid -13\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.148 weight 1.000 (esc)
   \titem osd.149 weight 1.000 (esc)
@@ -580,7 +581,7 @@
   host cephstore6245 {
   \tid -16\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.162 weight 1.000 (esc)
   \titem osd.163 weight 1.000 (esc)
@@ -593,7 +594,7 @@
   host cephstore6336 {
   \tid -18\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.176 weight 1.000 (esc)
   \titem osd.177 weight 1.000 (esc)
@@ -606,7 +607,7 @@
   host cephstore6338 {
   \tid -20\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.190 weight 1.000 (esc)
   \titem osd.191 weight 1.000 (esc)
@@ -619,7 +620,7 @@
   host cephstore6339 {
   \tid -21\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.197 weight 1.000 (esc)
   \titem osd.198 weight 1.000 (esc)
@@ -632,7 +633,7 @@
   host cephstore6340 {
   \tid -22\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.204 weight 1.000 (esc)
   \titem osd.205 weight 1.000 (esc)
@@ -645,7 +646,7 @@
   host cephstore6343 {
   \tid -26\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.225 weight 1.000 (esc)
   \titem osd.226 weight 1.000 (esc)
@@ -658,7 +659,7 @@
   host cephstore6230 {
   \tid -32\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.57 weight 1.000 (esc)
   \titem osd.58 weight 1.000 (esc)
@@ -671,7 +672,7 @@
   host cephstore6231 {
   \tid -33\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.64 weight 1.000 (esc)
   \titem osd.65 weight 1.000 (esc)
@@ -684,7 +685,7 @@
   host cephstore6232 {
   \tid -34\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.71 weight 1.000 (esc)
   \titem osd.72 weight 1.000 (esc)
@@ -697,7 +698,7 @@
   host cephstore6233 {
   \tid -35\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.78 weight 1.000 (esc)
   \titem osd.79 weight 1.000 (esc)
@@ -710,7 +711,7 @@
   host cephstore6234 {
   \tid -36\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.85 weight 1.000 (esc)
   \titem osd.86 weight 1.000 (esc)
@@ -723,7 +724,7 @@
   host cephstore6235 {
   \tid -37\t\t# do not change unnecessarily (esc)
   \t# weight 7.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem osd.92 weight 1.000 (esc)
   \titem osd.93 weight 1.000 (esc)
@@ -736,7 +737,7 @@
   rack irv-n1 {
   \tid -6\t\t# do not change unnecessarily (esc)
   \t# weight 119.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem cephstore6236 weight 7.000 (esc)
   \titem cephstore6237 weight 7.000 (esc)
@@ -759,7 +760,7 @@
   root default {
   \tid -1\t\t# do not change unnecessarily (esc)
   \t# weight 238.000 (esc)
-  \talg straw (esc)
+  \talg straw2 (esc)
   \thash 0\t# rjenkins1 (esc)
   \titem irv-n2 weight 119.000 (esc)
   \titem irv-n1 weight 119.000 (esc)
@@ -792,6 +793,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
+  min_compat_client hammer 0.94
   
   pool 0 'rbd' replicated size 3 min_size 2 crush_ruleset 0 object_hash rjenkins pg_num 15296 pgp_num 15296 last_change 0 flags hashpspool stripe_width 0
   

diff --git a/src/test/cli/osdmaptool/crush.t b/src/test/cli/osdmaptool/crush.t
index 0cd9ae61968607da2dc77328d25e8685e21b5c59..d2f27ef736d3b17a836148bb825d79a84aa62757 100644 (file)
--- 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 512 byte crush map from oc
+  osdmaptool: imported 492 byte crush map from oc
   osdmaptool: writing epoch 3 to myosdmap