From: Ricardo Dias <rdias@suse.com>
Date: Tue, 19 Feb 2019 16:00:40 +0000 (+0000)
Subject: msg/async: msgr2: don't smash client cookie on reconnect
X-Git-Tag: v14.1.0~42^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8dede06f15dc36483ab5a01e77b6ea6b53407fa9;p=ceph-ci.git

msg/async: msgr2: don't smash client cookie on reconnect

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index 62857e86c20..6be5f2021f3 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -2881,9 +2881,8 @@ CtPtr ProtocolV2::reuse_connection(AsyncConnectionRef existing,
   }
   exproto->reset_recv_state();
 
-  exproto->client_cookie = client_cookie;
-
   if (!reconnecting) {
+    exproto->client_cookie = client_cookie;
     exproto->peer_name = peer_name;
     exproto->connection_features = connection_features;
     existing->set_features(connection_features);