From f2e4109796549e6242283d2bba47d05785db823a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 30 Dec 2011 08:06:06 -0800 Subject: [PATCH] mon: don't ignore first full ratio update callback We get a callack on startup. Don't ignore it. Signed-off-by: Sage Weil --- src/mon/PGMonitor.cc | 2 +- src/mon/PGMonitor.h | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 98768bb322f71..1ad13b88a403c 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -69,7 +69,7 @@ public: PGMonitor::PGMonitor(Monitor *mn, Paxos *p) : PaxosService(mn, p), - ratio_lock("PGMonitor::ratio_lock"), need_ratio_update(false), first_ratio_update(true) + ratio_lock("PGMonitor::ratio_lock"), need_ratio_update(false), { ratio_monitor = new RatioMonitor(this); g_conf->add_observer(ratio_monitor); diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h index 32851c9368136..eb839def1d337 100644 --- a/src/mon/PGMonitor.h +++ b/src/mon/PGMonitor.h @@ -44,7 +44,7 @@ public: PGMap pg_map; Mutex ratio_lock; - bool need_ratio_update, first_ratio_update; + bool need_ratio_update; float new_full_ratio, new_nearfull_ratio; private: @@ -68,13 +68,6 @@ private: void update_full_ratios(float full_ratio, int nearfull_ratio) { Mutex::Locker l(ratio_lock); - - // ignore callback during startup - if (first_ratio_update) { - first_ratio_update = false; - return; - } - if (full_ratio != 0) new_full_ratio = full_ratio; if (nearfull_ratio != 0) -- 2.39.5