]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #29140 from liewegas/wip-40441-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Tue, 30 Jul 2019 22:15:40 +0000 (15:15 -0700)
committerGitHub <noreply@github.com>
Tue, 30 Jul 2019 22:15:40 +0000 (15:15 -0700)
nautilus: msg/async, v2: make the reset_recv_state() unconditional

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
1  2 
src/msg/async/ProtocolV2.cc

index 6b69eb937630d7679f6b2f90e0c49fb504a57e26,d456dbde180ad3093eb775565d5524aa0611ba3d..5666b24c7a2946e804a2b9097005f6889d112206
@@@ -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;