RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-21 02:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pipe: Drop connect_seq increase line

Browse Source 
Revert commit 0fc47e267b.

When accepting and "connect.connect_seq == existing->connect_seq",
existing->state maybe STATE_OPEN, STATE_STANDBY or STANDY_CONNECTING.
This commit only fix partial problem and want to assert
"(existing->state == STATE_CONNECTING)".

So later we added codes to catch
"(existing->state == STATE_OPEN || existing->state == STATE_STANDBY)"
before asserting.

Backport: dumpling, firefly, giant

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
This commit is contained in:
Haomai Wang 2015-02-25 23:38:54 +08:00
parent ff2d497f86
commit 67225cb3ee
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/msg/simple/Pipe.cc
View File

@ -1694,10 +1694,8 @@ void Pipe::writer()
<< " policy.server=" << policy.server << dendl;
// standby?
if (is_queued() && state == STATE_STANDBY && !policy.server) {
connect_seq++;
if (is_queued() && state == STATE_STANDBY && !policy.server)
state = STATE_CONNECTING;
}
// connect?
if (state == STATE_CONNECTING) {