]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
librbd: do not try to open parent journal when removing trash snapshot
authorMykola Golub <mgolub@suse.com>
Tue, 29 Oct 2019 14:39:09 +0000 (16:39 +0200)
committerMykola Golub <mgolub@suse.com>
Mon, 11 Nov 2019 12:08:29 +0000 (12:08 +0000)
commitf3eea7032ed71e16599065bbea89c3165f6a925e
tree0bc152086c3c5bf2095b6d3676ca0f2b8b706fc5
parent73de9cffb5418d2a82ed2ee596784f4f36dc3a6b
librbd: do not try to open parent journal when removing trash snapshot

Because the parent may be not promoted. Also disallow any proxied
maintenance operations before acquiring the lock.

Fixes: https://tracker.ceph.com/issues/42405
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 23e300cbf99987902669baeb6486d9ad37c8c69d)

Conflicts:
src/librbd/image/DetachChildRequest.cc (headers,
                                        RWLock::RLocker vs std::shared_lock,
                                        snap_lock vs image_lock)
src/librbd/image/DetachChildRequest.cc
src/test/librbd/image/test_mock_DetachChildRequest.cc