From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Mar 2017 16:06:43 +0000 (-0400)
Subject: mon/MgrMonitor: print MgrMap to log on each change
X-Git-Tag: v12.0.2~252^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dacb05251dcde58e75bd43d220df78d4a0bff91d;p=ceph.git

mon/MgrMonitor: print MgrMap to log on each change

The other services do this.

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

diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h
index d9c8e4eb8ce41..167573da47460 100644
--- a/src/mon/MgrMap.h
+++ b/src/mon/MgrMap.h
@@ -138,6 +138,12 @@ public:
       }
     }
   }
+
+  friend ostream& operator<<(ostream& out, const MgrMap& m) {
+    ostringstream ss;
+    m.print_summary(nullptr, &ss);
+    return out << ss.str();
+  }
 };
 
 WRITE_CLASS_ENCODER_FEATURES(MgrMap)
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index fcef7ca50f814..e9276cf364044 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -68,6 +68,7 @@ void MgrMonitor::create_pending()
 
 void MgrMonitor::encode_pending(MonitorDBStore::TransactionRef t)
 {
+  dout(10) << __func__ << " " << pending_map << dendl;
   bufferlist bl;
   pending_map.encode(bl, 0);
   put_version(t, pending_map.epoch, bl);
@@ -304,6 +305,12 @@ void MgrMonitor::send_digests()
   mon->timer.add_event_after(g_conf->mon_mgr_digest_period, digest_callback);
 }
 
+void MgrMonitor::on_active()
+{
+  if (mon->is_leader())
+    mon->clog->info() << "mgrmap e" << map.epoch << ": " << map;
+}
+
 void MgrMonitor::get_health(
   list<pair<health_status_t,string> >& summary,
   list<pair<health_status_t,string> > *detail,
diff --git a/src/mon/MgrMonitor.h b/src/mon/MgrMonitor.h
index b82b6df58a25a..a582d95b1f632 100644
--- a/src/mon/MgrMonitor.h
+++ b/src/mon/MgrMonitor.h
@@ -72,10 +72,10 @@ public:
   void check_subs();
   void send_digests();
 
+  void on_active() override;
   void get_health(list<pair<health_status_t,string> >& summary,
 		  list<pair<health_status_t,string> > *detail,
 		  CephContext *cct) const override;
-
   void tick() override;
 
   void print_summary(Formatter *f, std::ostream *ss) const;