]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33037 into master
authorSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 14:08:01 +0000 (08:08 -0600)
committerSage Weil <sage@redhat.com>
Sat, 8 Feb 2020 14:08:01 +0000 (08:08 -0600)
commit593420d0c72aad4c48cb5638eec9268f685a8ca7
tree94b779b74aa872aea4e2bcdfe85281df03c8e329
parent82c4bce2a12e81f8d4b377fddf358b55bef6b943
parent991354f17c061ef1a186e4858c6fb892128d4c6d
Merge PR #33037 into master

* refs/pull/33037/head:
osd/OSD: choose more heartbeat peers from different subtrees

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
src/osd/OSD.cc