pacific: mgr/rbd_support: fix recursive locking on CreateSnapshotRequests lock #54293
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
trociny
approved these changes
Nov 1, 2023
idryomov
approved these changes
Nov 1, 2023
The MirrorSnapshotScheduleHandler's run thread issues asynchronous create snapshot requests using a CreateSnapshotRequests instance. When the thread invokes a CreateSnapshotRequests instance's get_ioctx(), the instance's class variable lock is acquired. With the class variable lock held, the garbage collection of a CreateSnapshotRequests instance may race in the thread. The thread would then call CreateSnapshotRequests __del__() that tries to acquire the class variable lock that the thread already holds. Fix this recursive deadlock by converting the CreateSnapshotRequests lock from a class variable to an instance variable. There is no need to share the lock across CreateSnapshotRequests instances. Also convert MirrorSnapshotScheduleHandler, PerfHandler and TrashPurgeScheduleHandler class variables to instance variables that don't need to be shared across the instances. Fixes: https://tracker.ceph.com/issues/62994 Signed-off-by: Ramana Raja <rraja@redhat.com> Co-Authored-By: Ilya Dryomov <idryomov@gmail.com> (cherry picked from commit 4452bc2) Conflicts: src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py src/pybind/mgr/rbd_support/perf.py src/pybind/mgr/rbd_support/trash_purge_schedule.py - Above conflicts were due to commit e4a16e2 ("mgr/rbd_support: add type annotation") not in pacific
There is no need for CreateSnapshotRequests.__del__() that calls CreateSnapshotRequests.wait_for_pending(). MirrorSnapshotScheduleHandler.shutdown() already calls CreateSnapshotRequests.wait_for_pending(). Signed-off-by: Ramana Raja <rraja@redhat.com> (cherry picked from commit fed1e87) Conflicts: src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py - Above conflict was due to commit e4a16e2 ("mgr/rbd_support: add type annotation") not in pacific
ajarr
force-pushed
the
wip-63382-pacific
branch
from
79ca133
to
33afd50
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/63382
backport of #54251
parent tracker: https://tracker.ceph.com/issues/62994
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh