From: Sage Weil <sage@inktank.com>
Date: Fri, 18 May 2012 03:19:58 +0000 (-0700)
Subject: mon: only log map state changes from primary
X-Git-Tag: v0.48argonaut~137^2~35^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a1d757bc8a1b97ef6d89b635140206e977ed98b;p=ceph.git

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 5f562abddb33..8bc3e4076e6f 100644
--- 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 1a41792c647a..1ad9629e662f 100644
--- 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 063eb84e8a48..2cb0326f2013 100644
--- 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 1c2e9f0fd9c2..85f388631df0 100644
--- 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()