From: Yingxin <yingxin.cheng@intel.com>
Date: Sun, 12 Aug 2018 22:44:37 +0000 (+0800)
Subject: crimson/net: fix unittest_seastar_messenger errors
X-Git-Tag: v14.0.1~450^2~2^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d5d7c698c32beea845fe63c2be2259015b737d63;p=ceph.git

crimson/net: fix unittest_seastar_messenger errors

fix several bugs that may fail unittest_seastar_messenger:
1. keep holding the connection reference until closed.
2. zero h.reply before start to use it.
3. set server-side features correctly.
4. add missing return to link write with flush.
5. remove an empty lambda operation.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/net/SocketConnection.cc b/src/crimson/net/SocketConnection.cc
index 2523e713a3ee3..1c05393581bdc 100644
--- a/src/crimson/net/SocketConnection.cc
+++ b/src/crimson/net/SocketConnection.cc
@@ -314,8 +314,14 @@ seastar::future<> SocketConnection::send(MessageRef msg)
 
 seastar::future<> SocketConnection::close()
 {
+  // unregister_conn() drops a reference, so hold another until completion
+  auto cleanup = [conn = ConnectionRef(this)] {};
+
   get_messenger()->unregister_conn(this);
-  return seastar::when_all(in.close(), out.close()).discard_result();
+
+  return seastar::when_all(in.close(), out.close())
+    .discard_result()
+    .finally(std::move(cleanup));
 }
 
 // handshake
@@ -454,6 +460,7 @@ seastar::future<> SocketConnection::handle_connect()
       						h.connect.authorizer_protocol,
       						authorizer);
     }).then([this] (ceph::net::msgr_tag_t tag, bufferlist&& authorizer_reply) {
+      memset(&h.reply, 0, sizeof(h.reply));
       if (tag) {
 	return send_connect_reply(tag, std::move(authorizer_reply));
       }
@@ -465,7 +472,7 @@ seastar::future<> SocketConnection::handle_connect()
       }
       h.connect_seq = h.connect.connect_seq + 1;
       h.peer_global_seq = h.connect.global_seq;
-      set_features((uint64_t)h.reply.features & (uint64_t)h.connect.features);
+      set_features((uint64_t)policy.features_supported & (uint64_t)h.connect.features);
       // TODO: cct
       return send_connect_reply_ready(CEPH_MSGR_TAG_READY, std::move(authorizer_reply));
     });
@@ -482,7 +489,7 @@ SocketConnection::send_connect_reply(msgr_tag_t tag,
   h.reply.authorizer_len = authorizer_reply.length();
   return out.write(reinterpret_cast<const char*>(&h.reply), sizeof(h.reply))
     .then([this, reply=std::move(authorizer_reply)]() mutable {
-      out.write(std::move(reply));
+      return out.write(std::move(reply));
     }).then([this] {
       return out.flush();
     });
@@ -791,9 +798,8 @@ seastar::future<> SocketConnection::client_handshake(entity_type_t peer_type,
       ::encode(my_addr, bl, 0);
       return out.write(std::move(bl)).then([this] { return out.flush(); });
     }).then([=] {
-      }).then([=] {
-        return seastar::do_until([=] { return state == state_t::open; },
-                                 [=] { return connect(peer_type, host_type); });
+      return seastar::do_until([=] { return state == state_t::open; },
+                               [=] { return connect(peer_type, host_type); });
     }).then([this] {
       // start background processing of tags
       read_tags_until_next_message();