From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 26 Dec 2019 13:32:01 +0000 (-0500)
Subject: rbd-mirror: do not log error upon bootstrap cancel
X-Git-Tag: v15.1.0~352^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bfcd8a3de77e3dc6abc22a0b62a13774fe86c071;p=ceph.git

rbd-mirror: do not log error upon bootstrap cancel

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

diff --git a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc
index 16143f823fa6..cdc6a95aac67 100644
--- a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc
+++ b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc
@@ -479,7 +479,11 @@ void BootstrapRequest<I>::handle_image_sync(int r) {
   }
 
   if (r < 0) {
-    derr << "failed to sync remote image: " << cpp_strerror(r) << dendl;
+    if (r == -ECANCELED) {
+      dout(10) << "request canceled" << dendl;
+    } else {
+      derr << "failed to sync remote image: " << cpp_strerror(r) << dendl;
+    }
     m_ret_val = r;
   }