crimson/osd/heartbeat: use v2 address also

as we support v2 protocol, so no need to pick v1 address.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index c983ebe6aff45a78013609290b8b30bc890b6a73..a70c35086b1662f098307f3dedf01698acff7ee4 100644 (file)
--- 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;