]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async: msgr2: fix replacing race handling
authorRicardo Dias <rdias@suse.com>
Fri, 18 Jan 2019 10:51:00 +0000 (10:51 +0000)
committerRicardo Dias <rdias@suse.com>
Wed, 23 Jan 2019 13:59:28 +0000 (13:59 +0000)
Signed-off-by: Ricardo Dias <rdias@suse.com>
src/msg/async/ProtocolV2.cc

index d5fcd48daf589313b40b1d7f7737353e9bca3df3..770acf6907e5ba6b0fb06e2f93f154b79fba3396 100644 (file)
@@ -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) {