From 552b7469ded82c4269c8a0e230e8a1f6e6285c6d Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Fri, 4 Jan 2019 13:20:58 +0000 Subject: [PATCH] rbd_mirror: don't report error if image replay canceled Fixes: https://tracker.ceph.com/issues/36038 Signed-off-by: Mykola Golub --- src/tools/rbd_mirror/ImageReplayer.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 5cb5b6b9b78af..3fd9b5803527c 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -530,7 +530,9 @@ void ImageReplayer::handle_bootstrap(int r) { } } - if (r == -EREMOTEIO) { + if (on_start_interrupted()) { + return; + } else if (r == -EREMOTEIO) { m_local_image_tag_owner = ""; dout(5) << "remote image is non-primary" << dendl; on_start_fail(-EREMOTEIO, "remote image is non-primary"); @@ -542,8 +544,6 @@ void ImageReplayer::handle_bootstrap(int r) { } else if (r < 0) { on_start_fail(r, "error bootstrapping replay"); return; - } else if (on_start_interrupted()) { - return; } else if (m_resync_requested) { on_start_fail(0, "resync requested"); return; @@ -580,12 +580,12 @@ template void ImageReplayer::handle_init_remote_journaler(int r) { dout(10) << "r=" << r << dendl; - if (r < 0) { + if (on_start_interrupted()) { + return; + } else if (r < 0) { derr << "failed to initialize remote journal: " << cpp_strerror(r) << dendl; on_start_fail(r, "error initializing remote journal"); return; - } else if (on_start_interrupted()) { - return; } m_remote_journaler->add_listener(&m_remote_listener); -- 2.39.5