]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-mirror: do not cancel maintenance ops with missing finish events
authorJason Dillaman <dillaman@redhat.com>
Thu, 21 Jul 2016 11:28:54 +0000 (07:28 -0400)
committerJason Dillaman <dillaman@redhat.com>
Wed, 17 Aug 2016 17:22:06 +0000 (13:22 -0400)
librbd will replay these ops when opening an image, so rbd-mirror
should also ensure these ops are replayed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 862e581553fff510286b58135a1fd69705c06096)

src/tools/rbd_mirror/ImageReplayer.cc

index c5e81876a64fe9764860ceeae3d30fa6e2fc5ffb..6cb7607ef1ce65b8cb831d2f4bc4680606a6545a 100644 (file)
@@ -902,7 +902,7 @@ void ImageReplayer<I>::replay_flush() {
         ImageReplayer, &ImageReplayer<I>::handle_stop_replay_request>(this);
       m_local_journal->start_external_replay(&m_local_replay, ctx, stop_ctx);
     });
-  m_local_replay->shut_down(true, ctx);
+  m_local_replay->shut_down(false, ctx);
 }
 
 template <typename I>