From 48ee3aacef8b1628f41936bd13cc0327c44e59ef Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 9 Aug 2016 08:13:30 -0400 Subject: [PATCH] rbd-mirror: replaying state should include flush action Fixes: http://tracker.ceph.com/issues/16970 Signed-off-by: Jason Dillaman (cherry picked from commit 7246f1b771b4d1f336ac11b9e881c9eb32bcd4e1) --- src/tools/rbd_mirror/ImageReplayer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.h b/src/tools/rbd_mirror/ImageReplayer.h index d3dcbc1e4347a..589a5bf4aa96d 100644 --- a/src/tools/rbd_mirror/ImageReplayer.h +++ b/src/tools/rbd_mirror/ImageReplayer.h @@ -295,7 +295,8 @@ private: return !is_stopped_() && m_state != STATE_STOPPING && !m_stop_requested; } bool is_replaying_() const { - return m_state == STATE_REPLAYING; + return (m_state == STATE_REPLAYING || + m_state == STATE_REPLAY_FLUSHING); } bool update_mirror_image_status(bool force, const OptionalState &state); -- 2.39.5