]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
qa/workunits/rbd-nbd: work around "rbd feature disable" hang 49614/head
authorIlya Dryomov <idryomov@gmail.com>
Thu, 16 Feb 2023 11:53:02 +0000 (12:53 +0100)
committerIlya Dryomov <idryomov@gmail.com>
Thu, 16 Feb 2023 12:05:05 +0000 (13:05 +0100)
commitfcfef0a19e1d85a8b9414909268f1370ec82808d
tree112909d5011ee486adfb29d30fa7b5d12e7bdf0b
parent34e59c450298e1c05f07570f74a9489bd8479a44
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>
qa/workunits/rbd/rbd-nbd.sh