From: xie xingguo Date: Mon, 1 Aug 2016 02:18:07 +0000 (+0800) Subject: osd: drop buffer-related stats from _dispatch() X-Git-Tag: ses5-milestone5~179^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e3def6e53afd82ca62dcb9c0586060dc50a14c5;p=ceph.git osd: drop buffer-related stats from _dispatch() By moving the buffer-related stats into tick_without_osd_lock(), we are already accurate enough updating period of these counters. So there is no need to do this in this time-senstive method, which holds the big osd_lock. Signed-off-by: xie xingguo --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 3f0688dc051..9dc02d41dd9 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -6268,12 +6268,6 @@ void OSD::_dispatch(Message *m) assert(osd_lock.is_locked()); dout(20) << "_dispatch " << m << " " << *m << dendl; - logger->set(l_osd_buf, buffer::get_total_alloc()); - logger->set(l_osd_history_alloc_bytes, SHIFT_ROUND_UP(buffer::get_history_alloc_bytes(), 20)); - logger->set(l_osd_history_alloc_num, buffer::get_history_alloc_num()); - logger->set(l_osd_cached_crc, buffer::get_cached_crc()); - logger->set(l_osd_cached_crc_adjusted, buffer::get_cached_crc_adjusted()); - switch (m->get_type()) { // -- don't need lock -- @@ -6323,11 +6317,6 @@ void OSD::_dispatch(Message *m) dispatch_op(op); } } - - logger->set(l_osd_buf, buffer::get_total_alloc()); - logger->set(l_osd_history_alloc_bytes, SHIFT_ROUND_UP(buffer::get_history_alloc_bytes(), 20)); - logger->set(l_osd_history_alloc_num, buffer::get_history_alloc_num()); - } void OSD::handle_pg_scrub(MOSDScrub *m, PG *pg)