mon: remove unnecessary update_from_paxos calls

The refresh() will do this when the state changes; no need to
opportunistically call this method all of the time.

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

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 6af1305ada1d10711115ff85890f2c8e24a2861e..b4f7681ed9a9362695a223430286c30239b2a5e8 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -69,7 +69,6 @@ void AuthMonitor::tick()
 {
   if (!is_active()) return;
 
-  update_from_paxos();
   dout(10) << *this << dendl;
 
   if (!mon->is_leader()) return; 

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index 0a62be8bbba8e7da0d9b07f822d20a700e4e8f57..ec4656d4ec4d83ef46d2634d6772f9d20cfb234c 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -70,7 +70,6 @@ void LogMonitor::tick()
 {
   if (!is_active()) return;
 
-  update_from_paxos();
   dout(10) << *this << dendl;
 
   if (!mon->is_leader()) return; 

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 0314f2b2e4d18b8c87511e0f314ec5df3a8167b8..b5066c77cee09e16c7e68327d09f7aebc846b835 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1040,7 +1040,6 @@ void MDSMonitor::tick()
   // ...if i am an active leader
   if (!is_active()) return;
 
-  update_from_paxos();
   dout(10) << mdsmap << dendl;
   
   bool do_propose = false;

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index cbcefae104ff76d50f60c5bbfc4d8f1c37bc2126..435ac77cd0548d6011671c9a193a92296d5bb623 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -434,7 +434,6 @@ bool MonmapMonitor::should_propose(double& delay)
 
 void MonmapMonitor::tick()
 {
-  update_from_paxos();
 }
 
 void MonmapMonitor::get_health(list<pair<health_status_t, string> >& summary,

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index cf0e45d9a65af2d67f6f976959f8a1338ea3c7ee..04124f772a59b0501073be39103184e25f24bcae 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1650,7 +1650,6 @@ void OSDMonitor::tick()
 {
   if (!is_active()) return;
 
-  update_from_paxos();
   dout(10) << osdmap << dendl;
 
   if (!mon->is_leader()) return;

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 1178fcc381bde85200280b084c734245d52eb585..a8923662934c74da3f5285810ec99c62cdd7282c 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -120,7 +120,6 @@ void PGMonitor::tick()
 {
   if (!is_active()) return;
 
-  update_from_paxos();
   handle_osd_timeouts();
 
   if (mon->is_leader()) {