From: Ricardo Dias <rdias@suse.com>
Date: Fri, 18 Jan 2019 10:51:00 +0000 (+0000)
Subject: msg/async: msgr2: fix replacing race handling
X-Git-Tag: v14.1.0~271^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=126431053ad1074be015e233cc2a8fbbf6c860fa;p=ceph.git

msg/async: msgr2: fix replacing race handling

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

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index d5fcd48daf58..770acf6907e5 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -2719,9 +2719,8 @@ CtPtr ProtocolV2::handle_existing_connection(AsyncConnectionRef existing) {
     ldout(cct, 1) << __func__
                   << " existing racing replace happened while replacing."
                   << " existing=" << existing << dendl;
-    WaitFrame wait;
-    bufferlist &bl = wait.get_buffer();
-    return WRITE(bl, "wait", read_frame);
+    RetryGlobalFrame retry(this, exproto->peer_global_seq);
+    return WRITE(retry.get_buffer(), "session retry", read_frame);
   }
 
   if (exproto->peer_global_seq > peer_global_seq) {