From: Kefu Chai <kchai@redhat.com>
Date: Fri, 15 Feb 2019 15:10:28 +0000 (+0800)
Subject: crimson/osd: listen on v1 addresses
X-Git-Tag: v14.1.0~61^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5cc86c401070982301df0aef193152298d58d0c;p=ceph.git

crimson/osd: listen on v1 addresses

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

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 9055f325f6b7..3534b733b73d 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -108,6 +108,12 @@ 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;
   }
 }