update sources to v12.1.2

[ceph.git] / ceph / src / test / cli / osdmaptool / create-print.t

diff --git a/ceph/src/test/cli/osdmaptool/create-print.t b/ceph/src/test/cli/osdmaptool/create-print.t
index 81520af9ce582be5fbec4e4401e919ca8203b694..88e7918a1f23d0a5e1f01a5481cc4dad0b9c5e2c 100644 (file)
--- a/ceph/src/test/cli/osdmaptool/create-print.t
+++ b/ceph/src/test/cli/osdmaptool/create-print.t
@@ -1,4 +1,4 @@
-  $ osdmaptool --createsimple 3 myosdmap
+  $ osdmaptool --createsimple 3 myosdmap --with-default-pool
   osdmaptool: osdmap file 'myosdmap'
   osdmaptool: writing epoch 1 to myosdmap
 
@@ -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
   
@@ -59,8 +60,8 @@
   }
   
   # rules
-  rule replicated_ruleset {
-  \truleset 0 (esc)
+  rule replicated_rule {
+  \tid 0 (esc)
   \ttype replicated (esc)
   \tmin_size 1 (esc)
   \tmax_size 10 (esc)
@@ -77,33 +78,20 @@
   created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   modified \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
   flags 
+  crush_version 1
   full_ratio 0
   backfillfull_ratio 0
   nearfull_ratio 0
-  min_compat_client hammer 0.94
+  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
+  pool 1 'rbd' replicated size 3 min_size 2 crush_rule 0 object_hash rjenkins pg_num 192 pgp_num 192 last_change 0 flags hashpspool stripe_width 0 application rbd
   
   max_osd 3
   
-  $ osdmaptool --clobber --createsimple 3 --osd_pool_default_crush_replicated_ruleset 66 myosdmap
+  $ osdmaptool --clobber --createsimple 3 --with-default-pool myosdmap
   osdmaptool: osdmap file 'myosdmap'
   osdmaptool: writing epoch 1 to myosdmap
-  $ osdmaptool --print myosdmap | grep 'pool 0'
+  $ osdmaptool --print myosdmap | grep 'pool 1'
   osdmaptool: osdmap file 'myosdmap'
-  pool 0 'rbd' replicated size 3 min_size 2 crush_ruleset 66 object_hash rjenkins pg_num 192 pgp_num 192 last_change 0 flags hashpspool stripe_width 0
-  $ osdmaptool --clobber --createsimple 3 --osd_pool_default_crush_rule 55 myosdmap 2>&1 >/dev/null | sed -e 's/^.* 0 osd_pool_//'
-  osdmaptool: osdmap file 'myosdmap'
-  default_crush_rule is deprecated use osd_pool_default_crush_replicated_ruleset instead
-  default_crush_rule = 55 overrides osd_pool_default_crush_replicated_ruleset = 0
-  $ osdmaptool --print myosdmap | grep 'pool 0'
-  osdmaptool: osdmap file 'myosdmap'
-  pool 0 'rbd' replicated size 3 min_size 2 crush_ruleset 55 object_hash rjenkins pg_num 192 pgp_num 192 last_change 0 flags hashpspool stripe_width 0
-  $ osdmaptool --clobber --createsimple 3 --osd_pool_default_crush_replicated_ruleset 66 --osd_pool_default_crush_rule 55 myosdmap 2>&1 >/dev/null | sed -e 's/^.* 0 osd_pool_//'
-  osdmaptool: osdmap file 'myosdmap'
-  default_crush_rule is deprecated use osd_pool_default_crush_replicated_ruleset instead
-  default_crush_rule = 55 overrides osd_pool_default_crush_replicated_ruleset = 66
-  $ osdmaptool --print myosdmap | grep 'pool 0'
-  osdmaptool: osdmap file 'myosdmap'
-  pool 0 'rbd' replicated size 3 min_size 2 crush_ruleset 55 object_hash rjenkins pg_num 192 pgp_num 192 last_change 0 flags hashpspool stripe_width 0
+  pool 1 'rbd' replicated size 3 min_size 2 crush_rule 0 object_hash rjenkins pg_num 192 pgp_num 192 last_change 0 flags hashpspool stripe_width 0 application rbd
   $ rm -f myosdmap