test/cli/osdmaptool/: fix tests

CRUSH tunables now default to jewel; outputs vary and
upmap results are a bit different.

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

diff --git a/src/test/cli/osdmaptool/clobber.t b/src/test/cli/osdmaptool/clobber.t
index 301d3378b902739a8a9df7d76a9e262f0c917710..b1d134e702bfa75758ee2cf10bad9ba5f508f211 100644 (file)
--- a/src/test/cli/osdmaptool/clobber.t
+++ b/src/test/cli/osdmaptool/clobber.t
@@ -22,7 +22,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
-  min_compat_client hammer
+  min_compat_client jewel
   
   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
   
@@ -47,7 +47,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
-  min_compat_client hammer
+  min_compat_client jewel
   
   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 639de18d82511ce0adb1ac30c1991a9e07e1cc06..539de8e96430e70a5a16e9424a2b5f539f10281f 100644 (file)
--- a/src/test/cli/osdmaptool/create-print.t
+++ b/src/test/cli/osdmaptool/create-print.t
@@ -12,6 +12,7 @@
   tunable choose_total_tries 50
   tunable chooseleaf_descend_once 1
   tunable chooseleaf_vary_r 1
+  tunable chooseleaf_stable 1
   tunable straw_calc_version 1
   tunable allowed_bucket_algs 54
   
@@ -80,7 +81,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
-  min_compat_client hammer
+  min_compat_client jewel
   
   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 acff620648702e7fae480cc164dc584dcbf7fcc6..b55243a9515b3ca0748220c971bb70221e1a3c24 100644 (file)
--- a/src/test/cli/osdmaptool/create-racks.t
+++ b/src/test/cli/osdmaptool/create-racks.t
@@ -11,6 +11,7 @@
   tunable choose_total_tries 50
   tunable chooseleaf_descend_once 1
   tunable chooseleaf_vary_r 1
+  tunable chooseleaf_stable 1
   tunable straw_calc_version 1
   tunable allowed_bucket_algs 54
   
@@ -793,7 +794,7 @@
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
-  min_compat_client hammer
+  min_compat_client jewel
   
   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/upmap.t b/src/test/cli/osdmaptool/upmap.t
index b79bf86a0d51cda70aee94a4d0de7c5ed668cf0f..e86a56a4f97246dd7c7d4a05ccc2a4e22183091d 100644 (file)
--- a/src/test/cli/osdmaptool/upmap.t
+++ b/src/test/cli/osdmaptool/upmap.t
@@ -8,15 +8,15 @@
   checking for upmap cleanups
   upmap, max-count 11, max deviation 0.01
   $ cat c
-  ceph osd pg-upmap-items 0.3 54 52 156 155
-  ceph osd pg-upmap-items 0.1b 158 155 231 227 143 142
-  ceph osd pg-upmap-items 0.22 168 163 54 52 136 135
-  ceph osd pg-upmap-items 0.2e 87 86 54 52
-  ceph osd pg-upmap-items 0.6f 69 65 54 52 157 155
-  ceph osd pg-upmap-items 0.12b 54 52 226 227
-  ceph osd pg-upmap-items 0.13f 54 52 96 95 43 46
-  ceph osd pg-upmap-items 0.151 36 42 54 52
-  ceph osd pg-upmap-items 0.185 60 61 54 52
-  ceph osd pg-upmap-items 0.1e3 54 52
-  ceph osd pg-upmap-items 0.272 54 52
+  ceph osd pg-upmap-items 0.3 54 50 216 212 160 161
+  ceph osd pg-upmap-items 0.20 130 128 117 119 54 50
+  ceph osd pg-upmap-items 0.89 8 13 54 50
+  ceph osd pg-upmap-items 0.8d 219 223 210 209
+  ceph osd pg-upmap-items 0.90 163 166 210 209 192 191
+  ceph osd pg-upmap-items 0.12b 54 50 227 225
+  ceph osd pg-upmap-items 0.13f 54 50
+  ceph osd pg-upmap-items 0.151 36 37 54 50
+  ceph osd pg-upmap-items 0.1c0 78 83 43 48 54 50
+  ceph osd pg-upmap-items 0.1e3 54 50 197 201
+  ceph osd pg-upmap-items 0.2c4 54 50
   $ rm -f om c