RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

msgr: rename report_failures -> drop_msgs

Browse Source 
Name was from legacy behavior
This commit is contained in:
Sage Weil 2009-11-17 14:03:36 -08:00
parent 318698b07e
commit 760165c64a
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/msg/SimpleMessenger.cc
View File

@ -1173,18 +1173,12 @@ void SimpleMessenger::Pipe::fail()
assert(lock.is_locked());
stop();
report_failures();
drop_msgs();
for (unsigned i=0; i<rank->local.size(); i++)
if (rank->local[i])
rank->local[i]->queue_reset(connection_state->get());
// unregister
lock.Unlock();
rank->lock.Lock();
unregister_pipe();
rank->lock.Unlock();
lock.Lock();
}
void SimpleMessenger::Pipe::was_session_reset()
@ -1192,7 +1186,8 @@ void SimpleMessenger::Pipe::was_session_reset()
assert(lock.is_locked());
dout(10) << "was_session_reset" << dendl;
report_failures();
drop_msgs();
for (unsigned i=0; i<rank->local.size(); i++)
if (rank->local[i])
rank->local[i]->queue_remote_reset(connection_state->get());
@ -1202,10 +1197,10 @@ void SimpleMessenger::Pipe::was_session_reset()
connect_seq = 0;
}
void SimpleMessenger::Pipe::report_failures()
void SimpleMessenger::Pipe::drop_msgs()
{
// report failures
q[CEPH_MSG_PRIO_HIGHEST].splice(q[CEPH_MSG_PRIO_HIGHEST].begin(), sent);
assert(lock.is_locked());
while (1) {
Message *m = _get_next_outgoing();
if (!m)

2
src/msg/SimpleMessenger.h
View File

@ -133,7 +133,7 @@ private:
void was_session_reset();
void report_failures();
void drop_msgs();
// threads
class Reader : public Thread {