From: Sage Weil <sage@inktank.com>
Date: Mon, 18 Feb 2013 05:21:35 +0000 (-0800)
Subject: mon: fix pgmap stat smoothing
X-Git-Tag: v0.58~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94e7c148478f160322064cce599572adcc384b1c;p=ceph.git

mon: fix pgmap stat smoothing

<facepalm>

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 02ae6e95324d..ce8961418759 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -244,7 +244,7 @@ void PGMap::apply_incremental(CephContext *cct, const Incremental& inc)
   stamp_delta += delta_t;
 
   pg_sum_delta.stats.add(d.stats);
-  if (pg_sum_deltas.size() > (std::list< pair<pool_stat_t, utime_t> >::size_type)MIN(1, cct ? cct->_conf->mon_stat_smooth_intervals : 1)) {
+  if (pg_sum_deltas.size() > (std::list< pair<pool_stat_t, utime_t> >::size_type)MAX(1, cct ? cct->_conf->mon_stat_smooth_intervals : 1)) {
     pg_sum_delta.stats.sub(pg_sum_deltas.front().first.stats);
     stamp_delta -= pg_sum_deltas.front().second;
     pg_sum_deltas.pop_front();