From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Mar 2017 16:31:35 +0000 (-0400)
Subject: mon/MgrMonitor: show delta
X-Git-Tag: v12.0.2~252^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=319b72380e7058614d2375ff3f91447fef564e41;p=ceph-ci.git

mon/MgrMonitor: show delta

This is mostly because I couldn't debug a weird state where
it kept updating but it appeared the addr was not changing
(always '-').

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index e9276cf3640..cdca72a110d 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -202,7 +202,8 @@ bool MgrMonitor::prepare_beacon(MonOpRequestRef op)
   if (pending_map.active_gid == m->get_gid()) {
     // A beacon from the currently active daemon
     if (pending_map.active_addr != m->get_server_addr()) {
-      dout(4) << "learned address " << m->get_server_addr() << dendl;
+      dout(4) << "learned address " << m->get_server_addr()
+	      << " (was " << pending_map.active_addr << ")" << dendl;
       pending_map.active_addr = m->get_server_addr();
       updated = true;
     }
@@ -217,10 +218,13 @@ bool MgrMonitor::prepare_beacon(MonOpRequestRef op)
     if (pending_map.standbys.count(m->get_gid())) {
       drop_standby(m->get_gid());
     }
+    dout(4) << "selecting new active " << m->get_gid()
+	    << " " << m->get_name()
+	    << " (was " << pending_map.active_gid << " "
+	    << pending_map.active_name << ")" << dendl;
     pending_map.active_gid = m->get_gid();
     pending_map.active_name = m->get_name();
 
-    dout(4) << "selecting new active in epoch " << pending_map.epoch << dendl;
     updated = true;
   } else {
     if (pending_map.standbys.count(m->get_gid()) > 0) {