From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 19 Feb 2016 03:46:59 +0000 (+0800)
Subject: OSD: update heartbeat peers if unable to statfs
X-Git-Tag: v10.1.0~264^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46da33bd5065ea167695ee5297749398c97f4e0f;p=ceph.git

OSD: update heartbeat peers if unable to statfs

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

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<int>& 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<int>& 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;
 }