From 23604b3f7e568532d48892f9bddd7fca1040a79c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 15 Jul 2019 15:49:35 +0800 Subject: [PATCH] crimson/osd/heartbeat: use v2 address also as we support v2 protocol, so no need to pick v1 address. Signed-off-by: Kefu Chai --- src/crimson/osd/heartbeat.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc index c983ebe6aff..a70c35086b1 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -88,11 +88,11 @@ seastar::future<> Heartbeat::add_peer(osd_id_t peer, epoch_t epoch) if (found == peers.end()) { logger().info("add_peer({})", peer); auto osdmap = service.get_map(); - // TODO: msgr v2 + // TODO: use addrs return seastar::when_all_succeed( - front_msgr.connect(osdmap->get_hb_front_addrs(peer).legacy_addr(), + front_msgr.connect(osdmap->get_hb_front_addrs(peer).front(), CEPH_ENTITY_TYPE_OSD), - back_msgr.connect(osdmap->get_hb_back_addrs(peer).legacy_addr(), + back_msgr.connect(osdmap->get_hb_back_addrs(peer).front(), CEPH_ENTITY_TYPE_OSD)) .then([this, peer, epoch] (auto xcon_front, auto xcon_back) { PeerInfo info; -- 2.39.5