Skip to content

Commit

Permalink
mon: Forwarding fixes.
Browse files Browse the repository at this point in the history
forward_request_leader now uses messenger->send_message because it's created
a new message to forward.
resend_routed_requests properly decodes forwards to an MForward* rather than
a PaxosServiceMessage*.
  • Loading branch information
Greg Farnum committed Mar 22, 2010
1 parent e1d4854 commit 96f5ad3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/mon/Monitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ void Monitor::forward_request_leader(PaxosServiceMessage *req)

session->routed_request_tids.insert(rr->tid);

messenger->forward_message(forward, monmap->get_inst(mon));
messenger->send_message(forward, monmap->get_inst(mon));
} else {
dout(10) << "forward_request no session for request " << *req << dendl;
delete req;
Expand Down Expand Up @@ -450,7 +450,7 @@ void Monitor::resend_routed_requests()
RoutedRequest *rr = p->second;

bufferlist::iterator q = rr->request_bl.begin();
PaxosServiceMessage *req = (PaxosServiceMessage *)decode_message(q);
PaxosServiceMessage *req = (MForward *)decode_message(q);

dout(10) << " resend to mon" << mon << " tid " << rr->tid << " " << *req << dendl;
req->session_mon = whoami;
Expand Down

0 comments on commit 96f5ad3

Please sign in to comment.