update sources to v12.1.0

[ceph.git] / ceph / src / test / mon / osd-pool-create.sh

diff --git a/ceph/src/test/mon/osd-pool-create.sh b/ceph/src/test/mon/osd-pool-create.sh
index 3fd4feef8df79aad725256edc2ffaa7d40545bf3..53733abf80430ea8be5400a152b5075d2e5fbd62 100755 (executable)
--- a/ceph/src/test/mon/osd-pool-create.sh
+++ b/ceph/src/test/mon/osd-pool-create.sh
@@ -35,44 +35,6 @@ function run() {
     done
 }
 
-function TEST_default_deprectated_0() {
-    local dir=$1
-    # explicitly set the default crush rule
-    local expected=66
-    run_mon $dir a \
-        --osd_pool_default_crush_replicated_ruleset $expected || return 1
-    ceph osd pool get rbd crush_ruleset | grep 'ruleset: '$expected || return 1
-    ceph osd crush rule dump replicated_ruleset | grep '"ruleset": '$expected || return 1
-    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
-    ! grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
-}
-
-function TEST_default_deprectated_1() {
-    local dir=$1
-    # explicitly set the default crush rule using deprecated option
-    local expected=55
-    run_mon $dir a \
-        --osd_pool_default_crush_rule $expected || return 1
-    ceph osd pool get rbd crush_ruleset | grep 'ruleset: '$expected || return 1
-    ceph osd crush rule dump replicated_ruleset | grep '"ruleset": '$expected || return 1
-    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
-    grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
-}
-
-function TEST_default_deprectated_2() {
-    local dir=$1
-    local expected=77
-    local unexpected=33
-    run_mon $dir a \
-        --osd_pool_default_crush_rule $expected \
-        --osd_pool_default_crush_replicated_ruleset $unexpected || return 1
-    ceph osd pool get rbd crush_ruleset | grep 'ruleset: '$expected || return 1
-    ! ceph --format json osd dump | grep '"crush_ruleset":'$unexpected || return 1
-    ceph osd crush rule dump replicated_ruleset | grep '"ruleset": '$expected || return 1
-    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
-    grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
-}
-
 # Before http://tracker.ceph.com/issues/8307 the invalid profile was created
 function TEST_erasure_invalid_profile() {
     local dir=$1
@@ -95,9 +57,9 @@ function TEST_erasure_crush_rule() {
     ceph osd crush rule ls | grep $crush_ruleset
     local poolname
     poolname=pool_erasure1
-    ! ceph --format json osd dump | grep '"crush_ruleset":1' || return 1
+    ! ceph --format json osd dump | grep '"crush_rule":1' || return 1
     ceph osd pool create $poolname 12 12 erasure default $crush_ruleset
-    ceph --format json osd dump | grep '"crush_ruleset":1' || return 1
+    ceph --format json osd dump | grep '"crush_rule":1' || return 1
     #
     # a crush ruleset by the name of the pool is implicitly created
     #
@@ -183,49 +145,13 @@ function TEST_replicated_pool_with_ruleset() {
     ceph osd pool create $poolname 12 12 replicated $ruleset 2>&1 | \
         grep "pool 'mypool' created" || return 1
     rule_id=`ceph osd crush rule dump $ruleset | grep "rule_id" | awk -F[' ':,] '{print $4}'`
-    ceph osd pool get $poolname crush_ruleset  2>&1 | \
-        grep "crush_ruleset: $rule_id" || return 1
+    ceph osd pool get $poolname crush_rule  2>&1 | \
+        grep "crush_rule: $rule_id" || return 1
     #non-existent crush ruleset
     ceph osd pool create newpool 12 12 replicated non-existent 2>&1 | \
         grep "doesn't exist" || return 1
 }
 
-function TEST_replicated_pool_with_non_existent_default_ruleset_0() {
-    local dir=$1
-    run_mon $dir a || return 1
-    # change the default crush rule
-    ceph tell mon.a injectargs -- \
-        --osd_pool_default_crush_replicated_ruleset 66 || return 1
-    ceph osd pool create mypool 12 12 replicated 2>&1 | \
-        grep "No suitable CRUSH ruleset exists" || return 1
-    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
-    ! grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
-}
-
-function TEST_replicated_pool_with_non_existent_default_ruleset_1() {
-    local dir=$1
-    run_mon $dir a || return 1
-    # change the default crush rule using deprecated option
-    ceph tell mon.a injectargs -- \
-        --osd_pool_default_crush_rule 55 || return 1
-    ceph osd pool create mypool 12 12 replicated 2>&1 | \
-        grep "No suitable CRUSH ruleset exists" || return 1
-    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
-    grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
-}
-
-function TEST_replicated_pool_with_non_existent_default_ruleset_2() {
-    local dir=$1
-    run_mon $dir a || return 1
-    ceph tell mon.a injectargs -- \
-        --osd_pool_default_crush_rule 77 \
-        --osd_pool_default_crush_replicated_ruleset 33 || return 1
-    ceph osd pool create mypool 12 12 replicated 2>&1 | \
-        grep "No suitable CRUSH ruleset exists" || return 1
-    CEPH_ARGS='' ceph --admin-daemon $dir/ceph-mon.a.asok log flush || return 1
-    grep "osd_pool_default_crush_rule is deprecated " $dir/mon.a.log || return 1
-}
-
 function TEST_erasure_code_pool_lrc() {
     local dir=$1
     run_mon $dir a || return 1
@@ -248,9 +174,9 @@ function TEST_erasure_code_pool_lrc() {
 function TEST_replicated_pool() {
     local dir=$1
     run_mon $dir a || return 1
-    ceph osd pool create replicated 12 12 replicated replicated_ruleset 2>&1 | \
+    ceph osd pool create replicated 12 12 replicated replicated_rule 2>&1 | \
         grep "pool 'replicated' created" || return 1
-    ceph osd pool create replicated 12 12 replicated replicated_ruleset 2>&1 | \
+    ceph osd pool create replicated 12 12 replicated replicated_rule 2>&1 | \
         grep 'already exists' || return 1
     # default is replicated
     ceph osd pool create replicated1 12 12 2>&1 | \