From 2a8ab2d2d1a88eb90cc1dc27203c2874b9f6a99b Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 19 Dec 2017 09:22:30 -0500 Subject: [PATCH] rbd-mirror: propagate deletion only if remote image doesn't exist Signed-off-by: Jason Dillaman --- src/tools/rbd_mirror/ImageReplayer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index af5d4ff47f307..6da6639b0be2c 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -454,7 +454,7 @@ void ImageReplayer::handle_prepare_remote_image(int r) { dout(20) << "remote image does not exist" << dendl; // TODO need to support multiple remote images - if (!m_local_image_id.empty() && + if (m_remote_image.image_id.empty() && !m_local_image_id.empty() && m_local_image_tag_owner == m_remote_image.mirror_uuid) { // local image exists and is non-primary and linked to the missing // remote image -- 2.39.5