From aef30bdaa3f7ea5e6c09d02ce39f86b5d62ae31c Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 15 Feb 2019 16:28:44 +0800 Subject: [PATCH] Revert "msg/async: bump global_seq when retrying connection" This reverts commit ed65a7a53aedfd56343fdaefdeb59c22256f01b7. See: https://github.com/ceph/ceph/pull/25956 Seems we don't want [39e8de2](https://github.com/ceph/ceph/commit/39e8de2d72e2541323f8ed9d8b68075fcbd02701) to be backported. It turns out the old async-connection implementation will automatically bump the global_seq each time it switches to the STATE_CONNECTING state and restarts the connecting process. The same applies to mimic. Signed-off-by: xie xingguo --- src/msg/async/AsyncConnection.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index 383c79f367f59..3621b125b6110 100644 --- a/src/msg/async/AsyncConnection.cc +++ b/src/msg/async/AsyncConnection.cc @@ -2127,7 +2127,6 @@ void AsyncConnection::fault() } else { ldout(async_msgr->cct, 0) << __func__ << " initiating reconnect" << dendl; connect_seq++; - global_seq = async_msgr->get_global_seq(); state = STATE_CONNECTING; } backoff = utime_t(); @@ -2143,7 +2142,6 @@ void AsyncConnection::fault() backoff.set_from_double(async_msgr->cct->_conf->ms_max_backoff); } - global_seq = async_msgr->get_global_seq(); state = STATE_CONNECTING; ldout(async_msgr->cct, 10) << __func__ << " waiting " << backoff << dendl; // woke up again; -- 2.47.3