From bd4af8201cfbcce9ea473043aa9146e27f553b0e Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 16 Jun 2022 18:15:26 +0200 Subject: [PATCH] mgr/rbd_support: disambiguate mirror snapshot and trash purge schedule logs Signed-off-by: Ilya Dryomov --- .../rbd_support/mirror_snapshot_schedule.py | 19 ++++++++++++------- .../mgr/rbd_support/trash_purge_schedule.py | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py index d1eb61600ef7e..4a8481ba1c6d2 100644 --- a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py +++ b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py @@ -492,7 +492,7 @@ class MirrorSnapshotScheduleHandler: self.images: Dict[str, Dict[str, Dict[str, str]]] = {} self.watchers = Watchers(self) self.refresh_images() - self.log.debug("scheduler queue is initialized") + self.log.debug("MirrorSnapshotScheduleHandler: queue is initialized") def load_schedules(self) -> None: self.log.info("MirrorSnapshotScheduleHandler: load_schedules") @@ -642,8 +642,9 @@ class MirrorSnapshotScheduleHandler: schedule_time = schedule.next_run(now) if schedule_time not in self.queue: self.queue[schedule_time] = [] - self.log.debug("schedule image {}/{}/{} at {}".format( - pool_id, namespace, image_id, schedule_time)) + self.log.debug( + "MirrorSnapshotScheduleHandler: scheduling {}/{}/{} at {}".format( + pool_id, namespace, image_id, schedule_time)) image_spec = ImageSpec(pool_id, namespace, image_id) if image_spec not in self.queue[schedule_time]: self.queue[schedule_time].append(image_spec) @@ -682,7 +683,7 @@ class MirrorSnapshotScheduleHandler: interval: str, start_time: Optional[str]) -> Tuple[int, str, str]: self.log.debug( - "add_schedule: level_spec={}, interval={}, start_time={}".format( + "MirrorSnapshotScheduleHandler: add_schedule: level_spec={}, interval={}, start_time={}".format( level_spec.name, interval, start_time)) with self.lock: @@ -697,7 +698,7 @@ class MirrorSnapshotScheduleHandler: interval: Optional[str], start_time: Optional[str]) -> Tuple[int, str, str]: self.log.debug( - "remove_schedule: level_spec={}, interval={}, start_time={}".format( + "MirrorSnapshotScheduleHandler: remove_schedule: level_spec={}, interval={}, start_time={}".format( level_spec.name, interval, start_time)) with self.lock: @@ -708,7 +709,9 @@ class MirrorSnapshotScheduleHandler: return 0, "", "" def list(self, level_spec: LevelSpec) -> Tuple[int, str, str]: - self.log.debug("list: level_spec={}".format(level_spec.name)) + self.log.debug( + "MirrorSnapshotScheduleHandler: list: level_spec={}".format( + level_spec.name)) with self.lock: result = self.schedules.to_list(level_spec) @@ -716,7 +719,9 @@ class MirrorSnapshotScheduleHandler: return 0, json.dumps(result, indent=4, sort_keys=True), "" def status(self, level_spec: LevelSpec) -> Tuple[int, str, str]: - self.log.debug("status: level_spec={}".format(level_spec.name)) + self.log.debug( + "MirrorSnapshotScheduleHandler: status: level_spec={}".format( + level_spec.name)) scheduled_images = [] with self.lock: diff --git a/src/pybind/mgr/rbd_support/trash_purge_schedule.py b/src/pybind/mgr/rbd_support/trash_purge_schedule.py index d8a6e3f1600e2..042a529b8a64e 100644 --- a/src/pybind/mgr/rbd_support/trash_purge_schedule.py +++ b/src/pybind/mgr/rbd_support/trash_purge_schedule.py @@ -64,7 +64,7 @@ class TrashPurgeScheduleHandler: # pool_id => {namespace => pool_name} self.pools: Dict[str, Dict[str, str]] = {} self.refresh_pools() - self.log.debug("scheduler queue is initialized") + self.log.debug("TrashPurgeScheduleHandler: queue is initialized") def load_schedules(self) -> None: self.log.info("TrashPurgeScheduleHandler: load_schedules") @@ -162,8 +162,9 @@ class TrashPurgeScheduleHandler: schedule_time = schedule.next_run(now) if schedule_time not in self.queue: self.queue[schedule_time] = [] - self.log.debug("schedule {}/{} at {}".format( - pool_id, namespace, schedule_time)) + self.log.debug( + "TrashPurgeScheduleHandler: scheduling {}/{} at {}".format( + pool_id, namespace, schedule_time)) ns_spec = (pool_id, namespace) if ns_spec not in self.queue[schedule_time]: self.queue[schedule_time].append((pool_id, namespace)) @@ -201,7 +202,7 @@ class TrashPurgeScheduleHandler: interval: str, start_time: Optional[str]) -> Tuple[int, str, str]: self.log.debug( - "add_schedule: level_spec={}, interval={}, start_time={}".format( + "TrashPurgeScheduleHandler: add_schedule: level_spec={}, interval={}, start_time={}".format( level_spec.name, interval, start_time)) with self.lock: @@ -216,7 +217,7 @@ class TrashPurgeScheduleHandler: interval: Optional[str], start_time: Optional[str]) -> Tuple[int, str, str]: self.log.debug( - "remove_schedule: level_spec={}, interval={}, start_time={}".format( + "TrashPurgeScheduleHandler: remove_schedule: level_spec={}, interval={}, start_time={}".format( level_spec.name, interval, start_time)) with self.lock: @@ -227,7 +228,9 @@ class TrashPurgeScheduleHandler: return 0, "", "" def list(self, level_spec: LevelSpec) -> Tuple[int, str, str]: - self.log.debug("list: level_spec={}".format(level_spec.name)) + self.log.debug( + "TrashPurgeScheduleHandler: list: level_spec={}".format( + level_spec.name)) with self.lock: result = self.schedules.to_list(level_spec) @@ -235,7 +238,9 @@ class TrashPurgeScheduleHandler: return 0, json.dumps(result, indent=4, sort_keys=True), "" def status(self, level_spec: LevelSpec) -> Tuple[int, str, str]: - self.log.debug("status: level_spec={}".format(level_spec.name)) + self.log.debug( + "TrashPurgeScheduleHandler: status: level_spec={}".format( + level_spec.name)) scheduled = [] with self.lock: -- 2.39.5