From 03014a4ecc06cde420fad0c6c2a0177ebd7b839d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 2 Jun 2013 16:10:57 -0700 Subject: [PATCH] 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 --- src/mon/AuthMonitor.cc | 1 - src/mon/LogMonitor.cc | 1 - src/mon/MDSMonitor.cc | 1 - src/mon/MonmapMonitor.cc | 1 - src/mon/OSDMonitor.cc | 1 - src/mon/PGMonitor.cc | 1 - 6 files changed, 6 deletions(-) diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 6af1305ada1d1..b4f7681ed9a93 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 0a62be8bbba8e..ec4656d4ec4d8 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 0314f2b2e4d18..b5066c77cee09 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 cbcefae104ff7..435ac77cd0548 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 >& summary, diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index cf0e45d9a65af..04124f772a59b 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 1178fcc381bde..a8923662934c7 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()) { -- 2.39.5