From: John Spray <john.spray@redhat.com>
Date: Thu, 24 Aug 2017 18:07:37 +0000 (-0400)
Subject: mon/MgrMonitor: reset services map on drop_active
X-Git-Tag: v12.2.2~61^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca51a1b9d2cf0a3bf0fd7b69b833fa6696e61888;p=ceph.git

mon/MgrMonitor: reset services map on drop_active

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 7b629ae46599d79ca1929cfc6637b367c6bb9029)
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 0fb57c22676e..bad3174eee6d 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -641,6 +641,7 @@ void MgrMonitor::drop_active()
   pending_map.active_gid = 0;
   pending_map.available = false;
   pending_map.active_addr = entity_addr_t();
+  pending_map.services.clear();
 
   // So that when new active mgr subscribes to mgrdigest, it will
   // get an immediate response instead of waiting for next timer