Merge pull request #10526 from xiexingguo/xxg-wip-misc-2016-07-30

osd: minor performance improvements and fixes

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/osd/OSD.cc
index c37f80d4697aa14023dcd1aae1231dcdff37d1b2,9dc02d41dd9e09d051c1bf0de324753cc912e1e3..6b0782621ffe75c6f79c6f6653b8968445dfb1eb
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -4292,14 -4300,12 +4292,8 @@@ void OSD::tick(
    assert(osd_lock.is_locked());
    dout(10) << "tick" << 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());
- 
    if (is_active() || is_waiting_for_healthy()) {
      maybe_update_heartbeat_peers();
 -
 -    heartbeat_lock.Lock();
 -    heartbeat_check();
 -    heartbeat_lock.Unlock();
    }
  
    if (is_waiting_for_healthy()) {

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/ReplicatedPG.h
Simple merge