From: Samuel Just <sjust@redhat.com>
Date: Wed, 15 Sep 2021 04:41:46 +0000 (-0700)
Subject: Merge pull request #43106 from rzarzynski/wip-crimson-msgr-bind
X-Git-Tag: v17.1.0~883
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da0fa14bfa5666e3f2c0d4d6d13481070cfdf551;p=ceph.git

Merge pull request #43106 from rzarzynski/wip-crimson-msgr-bind

crimson: add support for ms_bind_retry_{delay,count}

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

da0fa14bfa5666e3f2c0d4d6d13481070cfdf551
diff --cc src/crimson/net/SocketMessenger.cc
index 6b5dd19f1e79,c688bd139fc3..e83f2473ebd1
--- a/src/crimson/net/SocketMessenger.cc
+++ b/src/crimson/net/SocketMessenger.cc
@@@ -88,13 -81,9 +81,13 @@@ SocketMessenger::bind_ertr::future<
  SocketMessenger::try_bind(const entity_addrvec_t& addrs,
                            uint32_t min_port, uint32_t max_port)
  {
 -  auto addr = addrs.front();
 +  // the classical OSD iterates over the addrvec and tries to listen on each
 +  // addr. crimson doesn't need to follow as there is a consensus we need to
 +  // worry only about proto v2.
 +  assert(addrs.size() == 1);
 +  auto addr = addrs.msgr2_addr();
    if (addr.get_port() != 0) {
-     return do_bind(addrs).safe_then([this] {
+     return do_listen(addrs).safe_then([this] {
        logger().info("{} try_bind: done", *this);
      });
    }