rbd-mirror: clean up logging during test shut down

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 ca036a98dffd447816b6c8b60cb8e8ae2e60d5b2..a84199968a253657c44be60dc252ba242bfa6a3d 100644 (file)
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -742,7 +742,7 @@ void ImageReplayer<I>::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 11979d09959ffdebd7873322993c1d1b034f3311..2e620938ff40d8d982c43160a69c6e8ee4b4ed34 100644 (file)
--- a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc
+++ b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc
@@ -55,8 +55,12 @@ void PrepareRemoteImageRequest<I>::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;
   }