crimson/osd: use v2 addresses

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

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index afa2a924c826dabb7a8d7e86b9a704a60d3e01dd..7bcfd16cc20dd334031c2d2812f78a7f5305184f 100644 (file)
--- 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 52335b018bff78cc2b6a339ad2489d70f67d04c4..cae846471b6a953de1c76bfb43498b4b7f2026b3 100644 (file)
--- 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 4f6faf338d9c8c6b3457a613aea256cec0a8c214..cb87cc03ca52ef4ed6eff764370cf97f46227f66 100644 (file)
--- 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);