]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: fix pgmap stat smoothing
authorSage Weil <sage@inktank.com>
Mon, 18 Feb 2013 05:21:35 +0000 (21:21 -0800)
committerSage Weil <sage@inktank.com>
Mon, 18 Feb 2013 05:21:35 +0000 (21:21 -0800)
<facepalm>

Signed-off-by: Sage Weil <sage@inktank.com>
src/mon/PGMap.cc

index 02ae6e95324d7cc7caed72e64c6f1f467907b12d..ce89614187591086d8b7bfc768f1dc5579b13932 100644 (file)
@@ -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();