From 7d1e644b62909fb3844c0559f5ea94419eae6864 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 16 Jun 2022 19:23:58 +0200 Subject: [PATCH] mgr/rbd_support: bail from refresh_pools() when there is no schedule Make refresh_pools() behave the same as refresh_images(). Signed-off-by: Ilya Dryomov --- src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py | 1 + src/pybind/mgr/rbd_support/trash_purge_schedule.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py index 97f4bf23609..013b210266b 100644 --- a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py +++ b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py @@ -512,6 +512,7 @@ class MirrorSnapshotScheduleHandler: with self.lock: if not self.schedules: + self.log.debug("MirrorSnapshotScheduleHandler: no schedules") self.watchers.unregister_all() self.images = {} self.queue = {} diff --git a/src/pybind/mgr/rbd_support/trash_purge_schedule.py b/src/pybind/mgr/rbd_support/trash_purge_schedule.py index e77049e756c..3b4d9068376 100644 --- a/src/pybind/mgr/rbd_support/trash_purge_schedule.py +++ b/src/pybind/mgr/rbd_support/trash_purge_schedule.py @@ -82,6 +82,14 @@ class TrashPurgeScheduleHandler: self.load_schedules() + with self.lock: + if not self.schedules: + self.log.debug("TrashPurgeScheduleHandler: no schedules") + self.pools = {} + self.queue = {} + self.last_refresh_pools = datetime.now() + return + pools: Dict[str, Dict[str, str]] = {} for pool_id, pool_name in get_rbd_pools(self.module).items(): -- 2.39.5