Skip to content

Commit cb16d96

Browse files
authored
Merge pull request ceph#54724 from ajarr/wip-63673
qa/workunits/rbd/cli_generic.sh: narrow race window ... when checking that rbd_support module command fails after blocklisting the module's client. Reviewed-by: Ilya Dryomov <[email protected]>
2 parents f26071f + ea033fe commit cb16d96

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

qa/workunits/rbd/cli_generic.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,6 @@ test_trash_purge_schedule_recovery() {
12611261
jq 'select(.name == "rbd_support")' |
12621262
jq -r '[.addrvec[0].addr, "/", .addrvec[0].nonce|tostring] | add')
12631263
ceph osd blocklist add $CLIENT_ADDR
1264-
ceph osd blocklist ls | grep $CLIENT_ADDR
12651264

12661265
# Check that you can add a trash purge schedule after a few retries
12671266
expect_fail rbd trash purge schedule add -p rbd3 10m
@@ -1420,7 +1419,6 @@ test_mirror_snapshot_schedule_recovery() {
14201419
jq 'select(.name == "rbd_support")' |
14211420
jq -r '[.addrvec[0].addr, "/", .addrvec[0].nonce|tostring] | add')
14221421
ceph osd blocklist add $CLIENT_ADDR
1423-
ceph osd blocklist ls | grep $CLIENT_ADDR
14241422

14251423
# Check that you can add a mirror snapshot schedule after a few retries
14261424
expect_fail rbd mirror snapshot schedule add -p rbd3/ns1 --image test1 2m
@@ -1529,7 +1527,6 @@ test_perf_image_iostat_recovery() {
15291527
jq 'select(.name == "rbd_support")' |
15301528
jq -r '[.addrvec[0].addr, "/", .addrvec[0].nonce|tostring] | add')
15311529
ceph osd blocklist add $CLIENT_ADDR
1532-
ceph osd blocklist ls | grep $CLIENT_ADDR
15331530

15341531
expect_fail rbd perf image iostat --format json rbd3/ns
15351532
sleep 10
@@ -1661,7 +1658,6 @@ test_tasks_recovery() {
16611658
jq 'select(.name == "rbd_support")' |
16621659
jq -r '[.addrvec[0].addr, "/", .addrvec[0].nonce|tostring] | add')
16631660
ceph osd blocklist add $CLIENT_ADDR
1664-
ceph osd blocklist ls | grep $CLIENT_ADDR
16651661

16661662
expect_fail ceph rbd task add flatten rbd2/clone1
16671663
sleep 10

0 commit comments

Comments
 (0)