From 33afd50b94ed2e80f03f232dd9d8708b04b2d2f8 Mon Sep 17 00:00:00 2001 From: Ramana Raja Date: Mon, 30 Oct 2023 11:05:27 -0400 Subject: [PATCH] mgr/rbd_support: remove CreateSnapshotRequests __del__() There is no need for CreateSnapshotRequests.__del__() that calls CreateSnapshotRequests.wait_for_pending(). MirrorSnapshotScheduleHandler.shutdown() already calls CreateSnapshotRequests.wait_for_pending(). Signed-off-by: Ramana Raja (cherry picked from commit fed1e87685a698876cf167b3681327e5b0066ee6) Conflicts: src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py - Above conflict was due to commit e4a16e2 ("mgr/rbd_support: add type annotation") not in pacific --- src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py index 69a8f677f862a..a8b56b165cb84 100644 --- a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py +++ b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py @@ -35,9 +35,6 @@ class CreateSnapshotRequests: self.queue = [] self.ioctxs = {} - def __del__(self): - self.wait_for_pending() - def wait_for_pending(self): with self.lock: while self.pending: -- 2.39.5