From: Mykola Golub <mgolub@suse.com>
Date: Mon, 20 May 2019 13:59:23 +0000 (+0100)
Subject: rbd-mirror: don't overwrite status error returned by replay
X-Git-Tag: v14.2.5~140^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=29eb502f3a2aa7f39eb9e47d3948c07fc5bcec42;p=ceph.git

rbd-mirror: don't overwrite status error returned by replay

Fixes: https://tracker.ceph.com/issues/39980
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit c06ebf0c075e0533149572fde6c203ab22495cf6)
---

diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index 14d66df135ff3..6c6ee2d5fb9bc 100644
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -965,14 +965,13 @@ void ImageReplayer<I>::handle_replay_complete(int r, const std::string &error_de
   dout(10) << "r=" << r << dendl;
   if (r < 0) {
     derr << "replay encountered an error: " << cpp_strerror(r) << dendl;
-    set_state_description(r, error_desc);
   }
 
   {
     Mutex::Locker locker(m_lock);
     m_stop_requested = true;
   }
-  on_replay_interrupted();
+  on_stop_journal_replay(r, error_desc);
 }
 
 template <typename I>