]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #40931 from AmnonHanuhov/wip-refactor_conn_send
authorAmnon Hanuhov <55089852+AmnonHanuhov@users.noreply.github.com>
Mon, 10 May 2021 10:37:29 +0000 (13:37 +0300)
committerGitHub <noreply@github.com>
Mon, 10 May 2021 10:37:29 +0000 (13:37 +0300)
crimson/net: Refactor conn::send()

1  2 
src/crimson/mon/MonClient.cc
src/crimson/mon/MonClient.h
src/crimson/osd/osd_operations/client_request.cc
src/crimson/osd/replicated_recovery_backend.cc
src/msg/Message.h

index 00819b436cc4e604706eeea8755ec3bdb312adab,bfb8089ad28298082f3a24f0c074c7034e4b800b..b97ed411fdb956a567dab6581d7f4351c2ae8e54
@@@ -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<MAuthReply> m) {
 +    return auth_reply.get_shared_future();
 +  }).then([this, life_extender=shared_from_this()] (Ref<MAuthReply> m) {
      if (!m) {
        ceph_assert(closed);
        logger().info("do_auth_single: connection closed");
Simple merge
Simple merge