From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 2 Mar 2020 13:36:23 +0000 (-0500)
Subject: librbd: clean-up special casing for enabling mirroring on creating image
X-Git-Tag: v15.1.1~153^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4a830a23a6b7ca9d49bc7bbab7992dad3175f34;p=ceph.git

librbd: clean-up special casing for enabling mirroring on creating image

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

diff --git a/src/librbd/mirror/EnableRequest.cc b/src/librbd/mirror/EnableRequest.cc
index 5071763a5c7e..beee05ac4e84 100644
--- a/src/librbd/mirror/EnableRequest.cc
+++ b/src/librbd/mirror/EnableRequest.cc
@@ -69,7 +69,8 @@ void EnableRequest<I>::handle_get_mirror_image(int r) {
       !m_non_primary_global_image_id.empty()) {
     // special case where rbd-mirror injects a disabled record to record the
     // local image id prior to creating ther image
-    r = -ENOENT;
+    ldout(m_cct, 10) << "enabling mirroring on in-progress image replication"
+                     << dendl;
   } else if (r == 0) {
     if (m_mirror_image.mode != m_mode) {
       lderr(m_cct) << "invalid current image mirror mode" << dendl;