File tree Expand file tree Collapse file tree 3 files changed +6
-5
lines changed
Expand file tree Collapse file tree 3 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -56,11 +56,12 @@ function TEST_set() {
5656 ceph osd erasure-code-profile get $profile | \
5757 grep -e key=value -e plugin=isa || return 1
5858 #
59- # --force is required to override an existing profile
59+ # --force & --yes-i-really-mean-it are required to override
60+ # an existing profile
6061 #
6162 ! ceph osd erasure-code-profile set $profile > $dir /out 2>&1 || return 1
6263 grep ' will not override' $dir /out || return 1
63- ceph osd erasure-code-profile set $profile key=other --force || return 1
64+ ceph osd erasure-code-profile set $profile key=other --force --yes-i-really-mean-it || return 1
6465 ceph osd erasure-code-profile get $profile | \
6566 grep key=other || return 1
6667
Original file line number Diff line number Diff line change @@ -2490,7 +2490,7 @@ function test_mon_osd_erasure_code()
24902490 ceph osd erasure-code-profile set fooprofile a=b c=d
24912491 ceph osd erasure-code-profile set fooprofile a=b c=d
24922492 expect_false ceph osd erasure-code-profile set fooprofile a=b c=d e=f
2493- ceph osd erasure-code-profile set fooprofile a=b c=d e=f --force
2493+ ceph osd erasure-code-profile set fooprofile a=b c=d e=f --force --yes-i-really-mean-it
24942494 ceph osd erasure-code-profile set fooprofile a=b c=d e=f
24952495 expect_false ceph osd erasure-code-profile set fooprofile a=b c=d e=f g=h
24962496 # make sure rule-foo doesn't work anymore
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ run_expect_nosignal "$RADOS_TOOL" --object-locator "asdf" ls
8989run_expect_nosignal " $RADOS_TOOL " --namespace " asdf" ls
9090
9191run_expect_succ " $CEPH_TOOL " osd pool create " $POOL " 8
92- run_expect_succ " $CEPH_TOOL " osd erasure-code-profile set myprofile k=2 m=1 stripe_unit=2K crush-failure-domain=osd --force
92+ run_expect_succ " $CEPH_TOOL " osd erasure-code-profile set myprofile k=2 m=1 stripe_unit=2K crush-failure-domain=osd --force --yes-i-really-mean-it
9393run_expect_succ " $CEPH_TOOL " osd pool create " $POOL_EC " 100 100 erasure myprofile
9494
9595
@@ -779,7 +779,7 @@ function test_stat()
779779 # ########### rados df test (EC pool): ##############
780780 $RADOS_TOOL purge $POOL_EC --yes-i-really-really-mean-it
781781 $CEPH_TOOL osd pool rm $POOL_EC $POOL_EC --yes-i-really-really-mean-it
782- $CEPH_TOOL osd erasure-code-profile set myprofile k=2 m=1 stripe_unit=2K crush-failure-domain=osd --force
782+ $CEPH_TOOL osd erasure-code-profile set myprofile k=2 m=1 stripe_unit=2K crush-failure-domain=osd --force --yes-i-really-mean-it
783783 $CEPH_TOOL osd pool create $POOL_EC 8 8 erasure
784784
785785 # put object
You can’t perform that action at this time.
0 commit comments