From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 30 Jul 2019 22:15:40 +0000 (-0700)
Subject: Merge pull request #29140 from liewegas/wip-40441-nautilus
X-Git-Tag: v14.2.3~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2c9186339c25aaa9960e065446998290219c781;p=ceph.git

Merge pull request #29140 from liewegas/wip-40441-nautilus

nautilus: msg/async, v2: make the reset_recv_state() unconditional

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

a2c9186339c25aaa9960e065446998290219c781
diff --cc src/msg/async/ProtocolV2.cc
index 6b69eb93763,d456dbde180..5666b24c7a2
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@@ -2673,11 -2671,8 +2674,9 @@@ CtPtr ProtocolV2::reuse_connection(Asyn
    connection->dispatch_queue->queue_reset(connection);
  
    exproto->can_write = false;
 +  exproto->write_in_progress = false;
    exproto->reconnecting = reconnecting;
    exproto->replacing = true;
-   std::swap(exproto->session_stream_handlers, session_stream_handlers);
-   exproto->auth_meta = auth_meta;
    existing->state_offset = 0;
    // avoid previous thread modify event
    exproto->state = NONE;