From: Ilya Dryomov Date: Thu, 16 Jun 2022 16:15:26 +0000 (+0200) Subject: mgr/rbd_support: disambiguate mirror snapshot and trash purge schedule logs X-Git-Tag: v16.2.11~103^2~27^2~5 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=034574aee4dd9d5fd0ebeb62cff315be49e8ee51;p=ceph.git mgr/rbd_support: disambiguate mirror snapshot and trash purge schedule logs Signed-off-by: Ilya Dryomov (cherry picked from commit bd4af8201cfbcce9ea473043aa9146e27f553b0e) 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 ] --- diff --git a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py index e5a14e4678776..d661d6d301bbd 100644 --- a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py +++ b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py @@ -465,7 +465,7 @@ class MirrorSnapshotScheduleHandler: self.images = {} 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): self.log.info("MirrorSnapshotScheduleHandler: load_schedules") @@ -611,8 +611,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 = (pool_id, namespace, image_id) if image_spec not in self.queue[schedule_time]: self.queue[schedule_time].append((pool_id, namespace, image_id)) @@ -647,7 +648,7 @@ class MirrorSnapshotScheduleHandler: def add_schedule(self, level_spec, interval, start_time): 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: @@ -659,7 +660,7 @@ class MirrorSnapshotScheduleHandler: def remove_schedule(self, level_spec, interval, start_time): 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: @@ -670,7 +671,9 @@ class MirrorSnapshotScheduleHandler: return 0, "", "" def list(self, level_spec): - 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) @@ -678,7 +681,9 @@ class MirrorSnapshotScheduleHandler: return 0, json.dumps(result, indent=4, sort_keys=True), "" def status(self, level_spec): - 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 930607d484307..1bb8f8a2fe4c2 100644 --- a/src/pybind/mgr/rbd_support/trash_purge_schedule.py +++ b/src/pybind/mgr/rbd_support/trash_purge_schedule.py @@ -63,7 +63,7 @@ class TrashPurgeScheduleHandler: self.queue = {} self.pools = {} self.refresh_pools() - self.log.debug("scheduler queue is initialized") + self.log.debug("TrashPurgeScheduleHandler: queue is initialized") def load_schedules(self): self.log.info("TrashPurgeScheduleHandler: load_schedules") @@ -161,8 +161,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)) @@ -197,7 +198,7 @@ class TrashPurgeScheduleHandler: def add_schedule(self, level_spec, interval, start_time): 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: @@ -209,7 +210,7 @@ class TrashPurgeScheduleHandler: def remove_schedule(self, level_spec, interval, start_time): 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: @@ -220,7 +221,9 @@ class TrashPurgeScheduleHandler: return 0, "", "" def list(self, level_spec): - 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) @@ -228,7 +231,9 @@ class TrashPurgeScheduleHandler: return 0, json.dumps(result, indent=4, sort_keys=True), "" def status(self, level_spec): - 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: