mon: only log map state changes from primary

We still get noise after elections, but only from the winner.

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

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 5f562abddb331e5815ccf32d8e235944cc87e958..8bc3e4076e6fbb4c7663df840a698a1f28fa230f 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -490,7 +490,8 @@ void MDSMonitor::on_active()
   tick();
   update_logger();
 
-  mon->clog.info() << "mdsmap " << mdsmap << "\n";
+  if (mon->is_leader())
+    mon->clog.info() << "mdsmap " << mdsmap << "\n";
 }
 
 void MDSMonitor::get_health(list<pair<health_status_t, string> >& summary,

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 1a41792c647aa6d5314788e6da5327ee09c40396..1ad9629e662fb4e73e948a6b37b9373723f39aae 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -265,7 +265,8 @@ bool MonmapMonitor::prepare_update(PaxosServiceMessage *m)
 
 void MonmapMonitor::on_active() 
 {
-  mon->clog.info() << "monmap " << *mon->monmap << "\n";
+  if (mon->is_leader())
+    mon->clog.info() << "monmap " << *mon->monmap << "\n";
 }
 
 bool MonmapMonitor::prepare_command(MMonCommand *m)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 063eb84e8a48e9ed62be2568211bd3057a57ff52..2cb0326f201323540c40fe79b0ffb9b7d7904a8f 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -234,7 +234,8 @@ void OSDMonitor::on_active()
   if (thrash_map && thrash())
     propose_pending();
 
-  mon->clog.info() << "osdmap " << osdmap << "\n"; 
+  if (mon->is_leader())
+    mon->clog.info() << "osdmap " << osdmap << "\n"; 
 }
 
 void OSDMonitor::update_logger()

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 1c2e9f0fd9c2806d47e375a250c731a95a5596f5..85f388631df09245a82f500f6b4c39ff37e26cd9 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -77,7 +77,8 @@ void PGMonitor::on_active()
 
   update_logger();
 
-  mon->clog.info() << "pgmap " << pg_map << "\n";
+  if (mon->is_leader())
+    mon->clog.info() << "pgmap " << pg_map << "\n";
 }
 
 void PGMonitor::update_logger()