From a5c5250600e9f2444edf5910809aeaef1ee766e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= Date: Wed, 27 Mar 2024 17:39:34 +0100 Subject: [PATCH] qa: tests override ec profiles with --yes-i-really-mean-it MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes a fallout from 629ba7bd349d48cdaa6d094751e7cfce651ba2bc. The problem has been nailed down by Laura Flores. Fixes: https://tracker.ceph.com/issues/65183 Signed-off-by: Radosław Zarzyński (cherry picked from commit 6f813236f8c617b3ff9517cf73ed256b5fede90e) --- qa/standalone/mon/osd-erasure-code-profile.sh | 5 +++-- qa/workunits/cephtool/test.sh | 2 +- qa/workunits/rados/test_rados_tool.sh | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qa/standalone/mon/osd-erasure-code-profile.sh b/qa/standalone/mon/osd-erasure-code-profile.sh index 0afc5fc0b92..e09e298bc9f 100755 --- a/qa/standalone/mon/osd-erasure-code-profile.sh +++ b/qa/standalone/mon/osd-erasure-code-profile.sh @@ -56,11 +56,12 @@ function TEST_set() { ceph osd erasure-code-profile get $profile | \ grep -e key=value -e plugin=isa || return 1 # - # --force is required to override an existing profile + # --force & --yes-i-really-mean-it are required to override + # an existing profile # ! ceph osd erasure-code-profile set $profile > $dir/out 2>&1 || return 1 grep 'will not override' $dir/out || return 1 - ceph osd erasure-code-profile set $profile key=other --force || return 1 + ceph osd erasure-code-profile set $profile key=other --force --yes-i-really-mean-it || return 1 ceph osd erasure-code-profile get $profile | \ grep key=other || return 1 diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index aecfd56a9f5..65dd95d959e 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -2490,7 +2490,7 @@ function test_mon_osd_erasure_code() ceph osd erasure-code-profile set fooprofile a=b c=d ceph osd erasure-code-profile set fooprofile a=b c=d expect_false ceph osd erasure-code-profile set fooprofile a=b c=d e=f - ceph osd erasure-code-profile set fooprofile a=b c=d e=f --force + ceph osd erasure-code-profile set fooprofile a=b c=d e=f --force --yes-i-really-mean-it ceph osd erasure-code-profile set fooprofile a=b c=d e=f expect_false ceph osd erasure-code-profile set fooprofile a=b c=d e=f g=h # make sure rule-foo doesn't work anymore diff --git a/qa/workunits/rados/test_rados_tool.sh b/qa/workunits/rados/test_rados_tool.sh index 9d025eee8ae..b822aa2b823 100755 --- a/qa/workunits/rados/test_rados_tool.sh +++ b/qa/workunits/rados/test_rados_tool.sh @@ -89,7 +89,7 @@ run_expect_nosignal "$RADOS_TOOL" --object-locator "asdf" ls run_expect_nosignal "$RADOS_TOOL" --namespace "asdf" ls run_expect_succ "$CEPH_TOOL" osd pool create "$POOL" 8 -run_expect_succ "$CEPH_TOOL" osd erasure-code-profile set myprofile k=2 m=1 stripe_unit=2K crush-failure-domain=osd --force +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 run_expect_succ "$CEPH_TOOL" osd pool create "$POOL_EC" 100 100 erasure myprofile @@ -779,7 +779,7 @@ function test_stat() ############ rados df test (EC pool): ############## $RADOS_TOOL purge $POOL_EC --yes-i-really-really-mean-it $CEPH_TOOL osd pool rm $POOL_EC $POOL_EC --yes-i-really-really-mean-it - $CEPH_TOOL osd erasure-code-profile set myprofile k=2 m=1 stripe_unit=2K crush-failure-domain=osd --force + $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 $CEPH_TOOL osd pool create $POOL_EC 8 8 erasure # put object -- 2.39.5