From: John Spray <john.spray@redhat.com>
Date: Thu, 29 Jun 2017 13:34:04 +0000 (-0400)
Subject: mon: send mgrdigest promptly to new active mgr
X-Git-Tag: v12.1.1~26^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb10b84a6aa0a6ff3aaa31930d00a1ede6d0cbfb;p=ceph.git

mon: send mgrdigest promptly to new active mgr

Previously, active mgrs ended up waiting around
until the next periodic message.  This is a lot
more noticeable now that the mgr isn't considered
active until it has loaded the digest data.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index f7cfd67a64e6..9f65531fc14c 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -483,6 +483,10 @@ void MgrMonitor::drop_active()
   pending_map.active_gid = 0;
   pending_map.available = false;
   pending_map.active_addr = entity_addr_t();
+
+  // So that when new active mgr subscribes to mgrdigest, it will
+  // get an immediate response instead of waiting for next timer
+  cancel_timer();
 }
 
 void MgrMonitor::drop_standby(uint64_t gid)