From: Sage Weil <sage@inktank.com>
Date: Fri, 19 Jul 2013 17:55:02 +0000 (-0700)
Subject: mon/PGMap: don't mangle stamp_delta in clear_delta()
X-Git-Tag: v0.67-rc1~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8574b3cdcfa9874dae471efacbb24c3ed0d48bfc;p=ceph.git

mon/PGMap: don't mangle stamp_delta in clear_delta()

This is a delta, not a timestamp.

This triggered when a cluster is idle for 2* the mon_delta_reset_interval,
and required a mon restart to fix.

Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index dfb6b1acfd3..ebdf582ff23 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -775,7 +775,7 @@ void PGMap::clear_delta()
 {
   pg_sum_delta = pool_stat_t();
   pg_sum_deltas.clear();
-  stamp_delta = ceph_clock_now(g_ceph_context);
+  stamp_delta = utime_t();
 }
 
 void PGMap::print_summary(Formatter *f, ostream *out) const