From: Sage Weil <sage@inktank.com>
Date: Sun, 2 Jun 2013 23:10:57 +0000 (-0700)
Subject: mon: remove unnecessary update_from_paxos calls
X-Git-Tag: v0.66~47^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03014a4ecc06cde420fad0c6c2a0177ebd7b839d;p=ceph.git

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 6af1305ada1d..b4f7681ed9a9 100644
--- 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 0a62be8bbba8..ec4656d4ec4d 100644
--- 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 0314f2b2e4d1..b5066c77cee0 100644
--- 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 cbcefae104ff..435ac77cd054 100644
--- 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 cf0e45d9a65a..04124f772a59 100644
--- 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 1178fcc381bd..a8923662934c 100644
--- 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()) {