]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MgrMonitor: reset services map on drop_active
authorJohn Spray <john.spray@redhat.com>
Thu, 24 Aug 2017 18:07:37 +0000 (14:07 -0400)
committerJohn Spray <john.spray@redhat.com>
Wed, 1 Nov 2017 23:03:28 +0000 (23:03 +0000)
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 7b629ae46599d79ca1929cfc6637b367c6bb9029)

src/mon/MgrMonitor.cc

index 0fb57c22676e7a4c99b3177c7cc08c36738bc37d..bad3174eee6ded89a004f7f72a021f508466deb7 100644 (file)
@@ -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