RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

msg/Pipe: go to standby on lossless server connection faults

Browse Source 
Go directly to the STANDBY state, and print a more accurate message.
Otherwise, we do the same check in writer() and go to STANDBY then.  This
is less confusing.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-07-20 09:00:26 -07:00
parent 9348bb388b
commit ef3fd1c39d
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/msg/Pipe.cc
View File

@ -1025,14 +1025,19 @@ void Pipe::fault(bool onconnect, bool onread)
if (state != STATE_CONNECTING) {
if (!onconnect)
ldout(msgr->cct,0) << "fault initiating reconnect" << dendl;
connect_seq++;
state = STATE_CONNECTING;
if (policy.server) {
ldout(msgr->cct,0) << "fault, server, going to standby" << dendl;
state = STATE_STANDBY;
} else {
if (!onconnect)
ldout(msgr->cct,0) << "fault, initiating reconnect" << dendl;
connect_seq++;
state = STATE_CONNECTING;
}
backoff = utime_t();
} else if (backoff == utime_t()) {
if (!onconnect)
ldout(msgr->cct,0) << "fault first fault" << dendl;
ldout(msgr->cct,0) << "fault" << dendl;
backoff.set_from_double(conf->ms_initial_backoff);
} else {
ldout(msgr->cct,10) << "fault waiting " << backoff << dendl;
@ -1216,12 +1221,9 @@ void Pipe::writer()
// connect?
if (state == STATE_CONNECTING) {
if (policy.server) {
state = STATE_STANDBY;
} else {
connect();
continue;
}
assert(!policy.server);
connect();
continue;
}
if (state == STATE_CLOSING) {