From: John Spray <john.spray@redhat.com>
Date: Wed, 29 Mar 2017 09:07:34 +0000 (+0100)
Subject: mon: update mgrmap when active goes offline
X-Git-Tag: v12.0.2~200^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aceabe6da8e68bdb2c166860af62db3a42a474f5;p=ceph.git

mon: update mgrmap when active goes offline

Fixes: http://tracker.ceph.com/issues/19407
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index d9cee80b463..d4756a15006 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -315,10 +315,10 @@ void MgrMonitor::tick()
       && last_beacon.at(pending_map.active_gid) < cutoff) {
 
     drop_active();
+    propose = true;
     dout(4) << "Dropping active" << pending_map.active_gid << dendl;
     if (promote_standby()) {
       dout(4) << "Promoted standby " << pending_map.active_gid << dendl;
-      propose = true;
     } else {
       dout(4) << "Active is laggy but have no standbys to replace it" << dendl;
     }