Merge pull request #12178 from liupan1111/wip-fix-bug-hb-out

osd: replace hb_out and hb_in with a single hb_peers

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/mon/PGMap.cc
Simple merge

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

diff --cc src/osd/osd_types.cc
index d05355b777ce5e77c75e546b33458020c506f117,b5b2657712ae70a4252a8afb57b2985c8d26aac1..bf514dca1c2cd1c1ed693d6391f6af4a647d37d3
--- 1/src/osd/osd_types.cc
--- 2/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@@ -335,10 -331,10 +331,10 @@@ void osd_stat_t::encode(bufferlist &bl
    ::encode(kb_avail, bl);
    ::encode(snap_trim_queue_len, bl);
    ::encode(num_snap_trimming, bl);
-   ::encode(hb_in, bl);
-   ::encode(hb_out, bl);
+   ::encode(hb_peers, bl);
+   ::encode((uint32_t)0, bl);
    ::encode(op_queue_age_hist, bl);
 -  ::encode(fs_perf_stat, bl);
 +  ::encode(os_perf_stat, bl);
    ENCODE_FINISH(bl);
  }
  

diff --cc src/osd/osd_types.h
index 0c8e5772ca193976bb0c59fe0dbceacf51b4a9c1,fee7b81560a5453626ed42bb1e8fd637d0ba2c3a..1ab311166eb2b7a1f2bd6c90a27fd68bc19da257
--- 1/src/osd/osd_types.h
--- 2/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@@ -887,10 -886,9 +887,9 @@@ inline bool operator==(const osd_stat_t
      l.kb_avail == r.kb_avail &&
      l.snap_trim_queue_len == r.snap_trim_queue_len &&
      l.num_snap_trimming == r.num_snap_trimming &&
-     l.hb_in == r.hb_in &&
-     l.hb_out == r.hb_out &&
+     l.hb_peers == r.hb_peers &&
      l.op_queue_age_hist == r.op_queue_age_hist &&
 -    l.fs_perf_stat == r.fs_perf_stat;
 +    l.os_perf_stat == r.os_perf_stat;
  }
  inline bool operator!=(const osd_stat_t& l, const osd_stat_t& r) {
    return !(l == r);