From: Ricardo Dias <rdias@suse.com>
Date: Mon, 18 Feb 2019 22:09:38 +0000 (+0000)
Subject: msg/async: msgr2: don't smash peer_name and features on reconnect
X-Git-Tag: v14.1.0~42^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50ed065c0b0c5f2f7f700f568aacf8cfe936b850;p=ceph.git

msg/async: msgr2: don't smash peer_name and features 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 678e9f1d9d83..62857e86c20c 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -2883,10 +2883,12 @@ CtPtr ProtocolV2::reuse_connection(AsyncConnectionRef existing,
 
   exproto->client_cookie = client_cookie;
 
-  exproto->peer_name = peer_name;
+  if (!reconnecting) {
+    exproto->peer_name = peer_name;
+    exproto->connection_features = connection_features;
+    existing->set_features(connection_features);
+  }
   exproto->peer_global_seq = peer_global_seq;
-  exproto->connection_features = connection_features;
-  existing->set_features(connection_features);
 
   auto temp_cs = std::move(connection->cs);
   EventCenter *new_center = connection->center;