From 8cbe5cc310ff735c4b5d2a313a7bbd70f71b7df9 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 16 Jun 2022 19:10:32 +0200 Subject: [PATCH] mgr/rbd_support: add logs for when there is no schedule and for descheduling Signed-off-by: Ilya Dryomov (cherry picked from commit 568345b47503d8e69e6f7d074a0083fc5de44a2e) Conflicts: src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py [ commit e4a16e261370 ("mgr/rbd_support: add type annotation") not in pacific ] src/pybind/mgr/rbd_support/trash_purge_schedule.py [ ditto ] --- src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py | 8 +++++++- src/pybind/mgr/rbd_support/trash_purge_schedule.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py index d661d6d301bb..219a44e6dc1d 100644 --- a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py +++ b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py @@ -603,9 +603,11 @@ class MirrorSnapshotScheduleHandler: self.condition.notify() def enqueue(self, now, pool_id, namespace, image_id): - schedule = self.schedules.find(pool_id, namespace, image_id) if not schedule: + self.log.debug( + "MirrorSnapshotScheduleHandler: no schedule for {}/{}/{}".format( + pool_id, namespace, image_id)) return schedule_time = schedule.next_run(now) @@ -637,6 +639,10 @@ class MirrorSnapshotScheduleHandler: return image, 0 def remove_from_queue(self, pool_id, namespace, image_id): + self.log.debug( + "MirrorSnapshotScheduleHandler: descheduling {}/{}/{}".format( + pool_id, namespace, image_id)) + empty_slots = [] for schedule_time, images in self.queue.items(): if (pool_id, namespace, image_id) in images: diff --git a/src/pybind/mgr/rbd_support/trash_purge_schedule.py b/src/pybind/mgr/rbd_support/trash_purge_schedule.py index 1bb8f8a2fe4c..106e8e649d42 100644 --- a/src/pybind/mgr/rbd_support/trash_purge_schedule.py +++ b/src/pybind/mgr/rbd_support/trash_purge_schedule.py @@ -153,9 +153,11 @@ class TrashPurgeScheduleHandler: self.condition.notify() def enqueue(self, now, pool_id, namespace): - schedule = self.schedules.find(pool_id, namespace) if not schedule: + self.log.debug( + "TrashPurgeScheduleHandler: no schedule for {}/{}".format( + pool_id, namespace)) return schedule_time = schedule.next_run(now) @@ -187,6 +189,10 @@ class TrashPurgeScheduleHandler: return namespace, 0 def remove_from_queue(self, pool_id, namespace): + self.log.debug( + "TrashPurgeScheduleHandler: descheduling {}/{}".format( + pool_id, namespace)) + empty_slots = [] for schedule_time, namespaces in self.queue.items(): if (pool_id, namespace) in namespaces: -- 2.47.3