diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-02 16:10:57 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-24 16:16:40 -0700 |
| commit | 1d8662504299babec22c714662cefbb86a0acb8b (patch) | |
| tree | eb4f96042ff512d9ab187dad26ef0860a7c2f543 | |
| parent | 34acc5a3161b6bcda2b9f7ce18d89a8618fff1c5 (diff) | |
| download | ceph-1d8662504299babec22c714662cefbb86a0acb8b.tar.gz | |
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>
(cherry picked from commit 03014a4ecc06cde420fad0c6c2a0177ebd7b839d)
| -rw-r--r-- | src/mon/AuthMonitor.cc | 1 | ||||
| -rw-r--r-- | src/mon/LogMonitor.cc | 1 | ||||
| -rw-r--r-- | src/mon/MDSMonitor.cc | 1 | ||||
| -rw-r--r-- | src/mon/MonmapMonitor.cc | 1 | ||||
| -rw-r--r-- | src/mon/OSDMonitor.cc | 1 | ||||
| -rw-r--r-- | src/mon/PGMonitor.cc | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index a5bc4f9d7e4..0fe94871f37 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -67,7 +67,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 f540cdcdfbe..5588ea06784 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 43747612dde..f9e24482a95 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -1080,7 +1080,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 d7472797f15..06927113d82 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -476,7 +476,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 b318ee6b526..573e3470dcd 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1645,7 +1645,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 17172980a0a..4a8c89801ac 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -114,7 +114,6 @@ void PGMonitor::tick() { if (!is_active()) return; - update_from_paxos(); handle_osd_timeouts(); if (mon->is_leader()) { |