From a3705f10ec5dca5e3156b9729b901711d818fdb3 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 14 Dec 2017 14:39:08 -0500 Subject: [PATCH] rbd-mirror: avoid logging an error for expected bootstrap failures Signed-off-by: Jason Dillaman --- src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc | 6 +++++- .../rbd_mirror/image_replayer/OpenLocalImageRequest.cc | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc index 2c24ef1f7d5..a8ca8ab0b29 100644 --- a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc @@ -466,7 +466,11 @@ void BootstrapRequest::handle_create_local_image(int r) { dout(20) << ": r=" << r << dendl; if (r < 0) { - derr << ": failed to create local image: " << cpp_strerror(r) << dendl; + if (r == -ENOENT) { + dout(10) << ": parent image does not exist" << dendl; + } else { + derr << ": failed to create local image: " << cpp_strerror(r) << dendl; + } m_ret_val = r; close_remote_image(); return; diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc index a54216a8328..604cfd453ba 100644 --- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc @@ -125,8 +125,12 @@ void OpenLocalImageRequest::handle_open_image(int r) { dout(20) << ": r=" << r << dendl; if (r < 0) { - derr << ": failed to open image '" << m_local_image_id << "': " - << cpp_strerror(r) << dendl; + if (r == -ENOENT) { + dout(10) << ": local image does not exist" << dendl; + } else { + derr << ": failed to open image '" << m_local_image_id << "': " + << cpp_strerror(r) << dendl; + } (*m_local_image_ctx)->destroy(); *m_local_image_ctx = nullptr; finish(r); -- 2.39.5