From c00f661882cdde2726763bd5173028b9faf7777d Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Wed, 31 Oct 2018 14:30:05 -0400 Subject: [PATCH] rbd-mirror: update mirror status when stopping Fixes: http://tracker.ceph.com/issues/36659 Signed-off-by: Jason Dillaman --- src/tools/rbd_mirror/ImageReplayer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 57adaca3bf4b5..5cb5b6b9b78af 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -791,7 +791,7 @@ void ImageReplayer::on_stop_journal_replay(int r, const std::string &desc) } set_state_description(r, desc); - update_mirror_image_status(false, boost::none); + update_mirror_image_status(true, boost::none); reschedule_update_status_task(-1); shut_down(0); } @@ -1398,7 +1398,7 @@ void ImageReplayer::send_mirror_status_update(const OptionalState &opt_state) case STATE_STOPPING: if (stopping_replay) { status.state = cls::rbd::MIRROR_IMAGE_STATUS_STATE_STOPPING_REPLAY; - status.description = "stopping replay"; + status.description = state_desc.empty() ? "stopping replay" : state_desc; break; } // FALLTHROUGH -- 2.39.5