]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: listen on v1 addresses
authorKefu Chai <kchai@redhat.com>
Fri, 15 Feb 2019 15:10:28 +0000 (23:10 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 19 Feb 2019 08:55:02 +0000 (16:55 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/osd.cc

index 9055f325f6b784034e12902ff3e615021b7c648b..3534b733b73d8d2c7d85948b20a6060d45b30e96 100644 (file)
@@ -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;
   }
 }