]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rbd_support: recover from "double blocklisting"
authorRamana Raja <rraja@redhat.com>
Wed, 10 May 2023 18:37:44 +0000 (14:37 -0400)
committerRamana Raja <rraja@redhat.com>
Tue, 8 Aug 2023 20:26:19 +0000 (16:26 -0400)
commit18e1449e5b953aacf68c275f2ad28baa297bda02
tree94b43991559d2ed3f0637e179047ea43ffae01f3
parent371695cb8c1a491a960c9f4976fb279ecf0d12b5
rbd_support: recover from "double blocklisting"

Recover from being blocklisted while recovering from blocklisting.
When the rbd_support  module is being set up to recover from client
blocklisting, the module's new rados client connection can also get
blocklisted. Currently, this will cause the recovery to fail and
the module will remain inoperable. Instead, retry module recovery
when the new client gets blocklisted during the module setup in the
recovery thread.

Fixes: https://tracker.ceph.com/issues/59713
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 4523d9b68ee84f69e8665a728d4037b53cdf3d6f)

Conflicts:
src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
src/pybind/mgr/rbd_support/module.py
src/pybind/mgr/rbd_support/perf.py
src/pybind/mgr/rbd_support/task.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
 - Above conflicts were due to commit dcb51b0
   ("mgr/rbd_support: define commands using CLICommand") not in pacific
src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
src/pybind/mgr/rbd_support/module.py
src/pybind/mgr/rbd_support/perf.py
src/pybind/mgr/rbd_support/task.py
src/pybind/mgr/rbd_support/trash_purge_schedule.py