From 46da33bd5065ea167695ee5297749398c97f4e0f Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 19 Feb 2016 11:46:59 +0800 Subject: [PATCH] OSD: update heartbeat peers if unable to statfs Signed-off-by: xie xingguo --- src/osd/OSD.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 7345d535301b..1635e8c11911 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -668,6 +668,11 @@ void OSDService::update_osd_stat(vector& hb_peers) { Mutex::Locker lock(stat_lock); + osd_stat.hb_in.swap(hb_peers); + osd_stat.hb_out.clear(); + + osd->op_tracker.get_age_ms_histogram(&osd_stat.op_queue_age_hist); + // fill in osd stats too struct statfs stbuf; int r = osd->store->statfs(&stbuf); @@ -688,13 +693,8 @@ void OSDService::update_osd_stat(vector& hb_peers) osd->logger->set(l_osd_stat_bytes_used, used); osd->logger->set(l_osd_stat_bytes_avail, avail); - osd_stat.hb_in.swap(hb_peers); - osd_stat.hb_out.clear(); - check_nearfull_warning(osd_stat); - osd->op_tracker.get_age_ms_histogram(&osd_stat.op_queue_age_hist); - dout(20) << "update_osd_stat " << osd_stat << dendl; } -- 2.47.3