From: Greg Farnum <gregf@hq.newdream.net>
Date: Mon, 22 Mar 2010 17:15:21 +0000 (-0700)
Subject: mon: Forwarding fixes.
X-Git-Tag: v0.20~237
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96f5ad3ab89dfd8d38b8026b1444ecedb3fe7c2d;p=ceph.git

mon: Forwarding fixes.

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*.
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 0b1cba1b0899..f22f73733a08 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -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;
@@ -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;