From: Jason Dillaman <dillaman@redhat.com>
Date: Sun, 12 Jan 2020 15:05:04 +0000 (-0500)
Subject: rbd-mirror: skip closing local image if it was already closed
X-Git-Tag: v15.1.0~250^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32578%2Fhead;p=ceph.git

rbd-mirror: skip closing local image if it was already closed

If the journal replayer finishes relaying (error or promotion), it will
close the local image. However, the image replayer state machine will also
shut down the journal replayer (again) which might result in attempting
to close the local image again.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc
index 87290b055018..4b6778e14550 100644
--- a/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc
+++ b/src/tools/rbd_mirror/image_replayer/journal/Replayer.cc
@@ -468,6 +468,10 @@ void Replayer<I>::handle_wait_for_event_replay(int r) {
 template <typename I>
 void Replayer<I>::close_local_image() {
   ceph_assert(ceph_mutex_is_locked_by_me(m_lock));
+  if (m_state_builder->local_image_ctx == nullptr) {
+    stop_remote_journaler_replay();
+    return;
+  }
 
   dout(10) << dendl;
   if (m_local_journal_listener != nullptr) {