diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-02 16:10:57 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-17 14:24:43 -0700 |
| commit | acae697cc36edc5f7db76616a59f263531adee17 (patch) | |
| tree | 0c51e47f84e97abccd716c82a854f1c6c3b675dd | |
| parent | b3df87269f878da47709124d2e5040c8ac10addc (diff) | |
| download | ceph-acae697cc36edc5f7db76616a59f263531adee17.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>
| -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 ec639c6d783..4b046268bea 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 0a62be8bbba..ec4656d4ec4 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 0314f2b2e4d..b5066c77cee 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 cbcefae104f..435ac77cd05 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 cf0e45d9a65..04124f772a5 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 1178fcc381b..a8923662934 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()) { |