From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Jun 2019 12:59:45 +0000 (-0500)
Subject: Merge PR #28453 into master
X-Git-Tag: v15.1.0~2428
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef1f331b8f22fcd7d7e0dc478a1d86ececeaeefd;p=ceph.git

Merge PR #28453 into master

* 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>
---

ef1f331b8f22fcd7d7e0dc478a1d86ececeaeefd
diff --cc src/msg/async/ProtocolV2.cc
index fc7a004b3438,b6e75c735a09..77ab2dfd9555
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@@ -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;