]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #28453 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Jun 2019 12:59:45 +0000 (07:59 -0500)
committerSage Weil <sage@redhat.com>
Wed, 19 Jun 2019 12:59:45 +0000 (07:59 -0500)
* refs/pull/28453/head:
qa/valgrind.supp: be slightly less specific on suppression
msg/async, v2: make the reset_recv_state() unconditional.

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/msg/async/ProtocolV2.cc

index fc7a004b3438d96a81e11636393b12da85db4d1f,b6e75c735a093cceed931a03ea672345b5eb2845..77ab2dfd955594c8a63d5dac6686d9de8b0df93b
@@@ -2678,11 -2674,8 +2679,9 @@@ CtPtr ProtocolV2::reuse_connection(cons
    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;