From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 19 Dec 2017 14:22:30 +0000 (-0500)
Subject: rbd-mirror: propagate deletion only if remote image doesn't exist
X-Git-Tag: v13.0.2~714^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a8ab2d2d1a88eb90cc1dc27203c2874b9f6a99b;p=ceph.git

rbd-mirror: propagate deletion only if remote image doesn't exist

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index af5d4ff47f30..6da6639b0be2 100644
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -454,7 +454,7 @@ void ImageReplayer<I>::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