From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 31 Oct 2018 18:30:05 +0000 (-0400)
Subject: rbd-mirror: update mirror status when stopping
X-Git-Tag: v12.2.12~102^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4565d5897e88bd402a63020e08886d823e5f2cfb;p=ceph.git

rbd-mirror: update mirror status when stopping

Fixes: http://tracker.ceph.com/issues/36659
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c00f661882cdde2726763bd5173028b9faf7777d)
---

diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index 11bc08bf48c..5ba3ee468db 100644
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -806,7 +806,7 @@ void ImageReplayer<I>::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);
 }
@@ -1411,7 +1411,7 @@ void ImageReplayer<I>::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