]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
qa/workunits/rbd-nbd: work around "rbd feature disable" hang 50159/head
authorIlya Dryomov <idryomov@gmail.com>
Thu, 16 Feb 2023 11:53:02 +0000 (12:53 +0100)
committerIlya Dryomov <idryomov@gmail.com>
Fri, 3 Mar 2023 18:12:11 +0000 (19:12 +0100)
commit9d080981615c80afb49f53c43dfa521d2de1088c
tree6d16d1e730df28fdcaa1cca163fe44391bf3fa3c
parenta769eef5d8d2921e1da7a6445b0746fc85b1b674
qa/workunits/rbd-nbd: work around "rbd feature disable" hang

"rbd feature disable" appears to reliably hang if the corresponding
remote request is proxied to rbd-nbd (because rbd-nbd happens to own
the exclusive lock after a series of blkdiscard calls) [1].  Work
around it here by enabling journaling before the image is mapped
and disabling it after the image is unmapped.

Also, don't assert on the output of "rbd journal inspect --verbose"
having a certain number of entries.  This is racy: if the script gets
delayed after the last blkdiscard call for some reason, there may be
fewer entries present in the journal or none at all.

[1] https://tracker.ceph.com/issues/58740

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit fcfef0a19e1d85a8b9414909268f1370ec82808d)
qa/workunits/rbd/rbd-nbd.sh