From: Amnon Hanuhov <55089852+AmnonHanuhov@users.noreply.github.com> Date: Mon, 10 May 2021 10:37:29 +0000 (+0300) Subject: Merge pull request #40931 from AmnonHanuhov/wip-refactor_conn_send X-Git-Tag: v17.1.0~2024 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7860c48b22fff6c4a9b33ea248df49b2f56eb9da;p=ceph.git Merge pull request #40931 from AmnonHanuhov/wip-refactor_conn_send crimson/net: Refactor conn::send() --- 7860c48b22fff6c4a9b33ea248df49b2f56eb9da diff --cc src/crimson/mon/MonClient.cc index 00819b436cc4,bfb8089ad282..b97ed411fdb9 --- a/src/crimson/mon/MonClient.cc +++ b/src/crimson/mon/MonClient.cc @@@ -221,10 -220,10 +221,10 @@@ Connection::do_auth_single(Connection:: assert(0); } logger().info("sending {}", *m); - return conn->send(m).then([this] { + return conn->send(std::move(m)).then([this] { logger().info("waiting"); - return reply.get_shared_future(); - }).then([this] (Ref m) { + return auth_reply.get_shared_future(); + }).then([this, life_extender=shared_from_this()] (Ref m) { if (!m) { ceph_assert(closed); logger().info("do_auth_single: connection closed");