]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-mirror: don't overwrite status error returned by replay 29870/head
authorMykola Golub <mgolub@suse.com>
Mon, 20 May 2019 13:59:23 +0000 (14:59 +0100)
committerMykola Golub <mgolub@suse.com>
Sun, 25 Aug 2019 11:30:51 +0000 (14:30 +0300)
Fixes: https://tracker.ceph.com/issues/39980
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit c06ebf0c075e0533149572fde6c203ab22495cf6)

src/tools/rbd_mirror/ImageReplayer.cc

index 14d66df135ff3889d6effecae787b89e05831879..6c6ee2d5fb9bc8ca0db5eae26f07836b1ff7eaed 100644 (file)
@@ -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>