From 36f3c9ae094a7d60542980a6cffd66aa0eec6543 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 31 Jul 2017 08:37:38 -0400 Subject: [PATCH] rbd-mirror: clean up logging during test shut down Signed-off-by: Jason Dillaman --- src/tools/rbd_mirror/ImageReplayer.cc | 2 +- .../image_replayer/PrepareRemoteImageRequest.cc | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index ca036a98dffd..a84199968a25 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -742,7 +742,7 @@ void ImageReplayer::on_start_fail(int r, const std::string &desc) Mutex::Locker locker(m_lock); assert(m_state == STATE_STARTING); m_state = STATE_STOPPING; - if (r < 0 && r != -ECANCELED && r != -EREMOTEIO) { + if (r < 0 && r != -ECANCELED && r != -EREMOTEIO && r != -ENOENT) { derr << "start failed: " << cpp_strerror(r) << dendl; } else { dout(20) << "start canceled" << dendl; diff --git a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc index 11979d09959f..2e620938ff40 100644 --- a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc @@ -55,8 +55,12 @@ void PrepareRemoteImageRequest::handle_get_remote_mirror_uuid(int r) { dout(20) << "r=" << r << dendl; if (r < 0) { - derr << "failed to retrieve remote mirror uuid: " << cpp_strerror(r) - << dendl; + if (r == -ENOENT) { + dout(5) << "remote mirror uuid missing" << dendl; + } else { + derr << "failed to retrieve remote mirror uuid: " << cpp_strerror(r) + << dendl; + } finish(r); return; } -- 2.47.3