From: Yingxin Date: Thu, 30 Aug 2018 10:10:07 +0000 (+0800) Subject: crimson/net: init h.global_seq during handshake X-Git-Tag: v14.0.1~408^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b66c5bc11b33038b4afbbd8ec2f25be52c6ed4a;p=ceph.git crimson/net: init h.global_seq during handshake Signed-off-by: Yingxin --- diff --git a/src/crimson/net/SocketConnection.cc b/src/crimson/net/SocketConnection.cc index 24fcd6fab99a..c163273f8bd9 100644 --- a/src/crimson/net/SocketConnection.cc +++ b/src/crimson/net/SocketConnection.cc @@ -526,9 +526,10 @@ seastar::future<> SocketConnection::send_connect_reply_ready(msgr_tag_t tag, bufferlist&& authorizer_reply) { + h.global_seq = get_messenger()->get_global_seq(); h.reply.tag = tag; h.reply.features = policy.features_supported; - h.reply.global_seq = get_messenger()->get_global_seq(); + h.reply.global_seq = h.global_seq; h.reply.connect_seq = h.connect_seq; h.reply.flags = 0; if (policy.lossy) { @@ -820,6 +821,7 @@ seastar::future<> SocketConnection::client_handshake(entity_type_t peer_type, bufferlist bl; bl.append(buffer::create_static(banner_size, banner)); ::encode(my_addr, bl, 0); + h.global_seq = get_messenger()->get_global_seq(); return out.write(std::move(bl)).then([this] { return out.flush(); }); }).then([=] { return seastar::do_until([=] { return state == state_t::open; },