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

mon: make send_reply always consume reply ref (even if not sent); fix caller hackery

Browse Source
This commit is contained in:
Sage Weil 2010-06-11 10:08:10 -07:00
parent e5ff518946
commit 658d51dae1
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mon/Monitor.cc
View File

@ -439,9 +439,11 @@ void Monitor::send_reply(PaxosServiceMessage *req, Message *reply, entity_inst_t
<< " for request " << *req << dendl;
messenger->send_message(new MRoute(req->session_mon_tid, reply, to),
monmap->get_inst(req->session_mon));
} else
} else {
dout(2) << "send_reply mon" << req->session_mon << " dne, dropping reply " << *reply
<< " to " << *req << " for " << to << dendl;
reply->put();
}
} else {
messenger->send_message(reply, to);
}
@ -523,12 +525,7 @@ void Monitor::handle_observe(MMonObserve *m)
// we own the connection to the requested observer).
MonSession *session = m->get_session();
if (!session || !session->caps.check_privileges(PAXOS_MONMAP, MON_CAP_X)) {
bool delete_m = false;
if (m->session_mon)
delete_m = true;
send_reply(m, m);
if (delete_m)
m->put();
return;
}
if (m->machine_id >= PAXOS_NUM) {