From d0bbed58a403ef1443a1b47ab7b210eefafe1894 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 8 Feb 2021 11:53:28 -0500 Subject: [PATCH] rbd-mirror: don't prune older mirror snapshots when pruning incomplete snapshot Since we normally prune in order, we need to ensure that we don't prune older snapshots when we need to delete an incomplete mirror snapshot since the older snapshot might be the only remaining mirror snapshot. Signed-off-by: Jason Dillaman (cherry picked from commit 7ba9214ea5b73d0436af6c2896abf4836d741de9) --- .../rbd_mirror/image_replayer/snapshot/Replayer.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc index dec37ad8b3a9..46be2ec8fe97 100644 --- a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc +++ b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc @@ -431,17 +431,19 @@ void Replayer::scan_local_mirror_snapshots( prune_snap_ids.insert(local_snap_id); } } else { - // start snap will be last complete mirror snapshot or initial - // image revision - m_local_snap_id_end = local_snap_id; - if (mirror_ns->last_copied_object_number == 0) { // snapshot might be missing image state, object-map, etc, so just // delete and re-create it if we haven't started copying data - // objects + // objects. Also only prune this snapshot since we will need the + // previous mirror snapshot for syncing. + prune_snap_ids.clear(); prune_snap_ids.insert(local_snap_id); break; } + + // start snap will be last complete mirror snapshot or initial + // image revision + m_local_snap_id_end = local_snap_id; } } else if (mirror_ns->is_primary()) { if (mirror_ns->complete) { -- 2.47.3