diff options
| author | Sage Weil <sage@newdream.net> | 2012-01-27 17:32:28 -0800 |
|---|---|---|
| committer | Sage Weil <sage.weil@dreamhost.com> | 2012-01-28 14:59:03 -0800 |
| commit | 5e16974c291e78f5a7cdc3c4f680e7817cff3cca (patch) | |
| tree | 57e33f8427fd7e32678f69dfe35623338cb5682c | |
| parent | 9e78d53d6a8da9d2fffd0262f74c0d3b99939793 (diff) | |
| download | ceph-5e16974c291e78f5a7cdc3c4f680e7817cff3cca.tar.gz | |
osd: reset pgstats timer when we reopen monitor session
Otherwise we'll reopen every second from here on out, without giving the
new session a chance to start up and do it's thing.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | src/osd/OSD.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 6c719dcccf6..64b6e59f248 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1814,8 +1814,9 @@ void OSD::tick() if (outstanding_pg_stats &&(now - g_conf->osd_mon_ack_timeout) > last_pg_stats_ack) { dout(1) << "mon hasn't acked PGStats in " << now - last_pg_stats_ack - << "seconds, reconnecting elsewhere" << dendl; + << " seconds, reconnecting elsewhere" << dendl; monc->reopen_session(); + last_pg_stats_ack = ceph_clock_now(g_ceph_context); // reset clock } // only do waiters if dispatch() isn't currently running. (if it is, |