From f5f9c5668c46547e0b279b7a5d73a62795fe6abe Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 8 Apr 2019 19:38:57 +0800
Subject: [PATCH] crimson/osd: use v2 addresses

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/crimson/mon/MonClient.cc | 2 +-
 src/crimson/osd/osd.cc       | 3 ---
 src/crimson/osd/pg.cc        | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index afa2a924c82..7bcfd16cc20 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -873,7 +873,7 @@ seastar::future<> Client::reopen_session(int rank)
   pending_conns.reserve(mons.size());
   return seastar::parallel_for_each(mons, [this](auto rank) {
 #warning fixme
-    auto peer = monmap.get_addrs(rank).legacy_addr();
+    auto peer = monmap.get_addrs(rank).front();
     logger().info("connecting to mon.{}", rank);
     return msgr.connect(peer, CEPH_ENTITY_TYPE_MON).then([this] (auto xconn) {
       // sharded-messenger compatible mode assumes all connections running
diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 52335b018bf..cae846471b6 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -138,10 +138,7 @@ namespace {
     if (int r = ::pick_addresses(&cct, what, &addrs, -1); r < 0) {
       throw std::runtime_error("failed to pick address");
     }
-    // TODO: v2: ::pick_addresses() returns v2 addresses, but crimson-msgr does
-    // not support v2 yet. remove following set_type() once v2 support is ready.
     for (auto addr : addrs.v) {
-      addr.set_type(addr.TYPE_LEGACY);
       logger().info("picked address {}", addr);
     }
     return addrs;
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 4f6faf338d9..cb87cc03ca5 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -924,7 +924,7 @@ seastar::future<> PG::send_to_osd(int peer, Ref<Message> m, epoch_t from_epoch)
   if (osdmap->is_down(peer) || osdmap->get_info(peer).up_from > from_epoch) {
     return seastar::now();
   } else {
-    return msgr.connect(osdmap->get_cluster_addrs(peer).legacy_addr(),
+    return msgr.connect(osdmap->get_cluster_addrs(peer).front(),
                         CEPH_ENTITY_TYPE_OSD)
      .then([m, this] (auto xconn) {
        return (*xconn)->send(m);
-- 
2.39.5