]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: Fix resend_routed_requests.
authorGreg Farnum <gregf@hq.newdream.net>
Mon, 22 Mar 2010 18:04:33 +0000 (11:04 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Mon, 22 Mar 2010 18:04:33 +0000 (11:04 -0700)
Stuff was left over from when forwards came in as a standard
PaxosServiceMessage, which is now removed.

src/mon/Monitor.cc

index e8070f1237bd45ad8afcab3d7fee71456676aa52..d994c220b54f95bd8db3f7eb7b93fb128d80fa72 100644 (file)
@@ -450,11 +450,9 @@ void Monitor::resend_routed_requests()
     RoutedRequest *rr = p->second;
 
     bufferlist::iterator q = rr->request_bl.begin();
-    PaxosServiceMessage *req = (MForward *)decode_message(q);
+    MForward *req = (MForward *)decode_message(q);
 
-    dout(10) << " resend to mon" << mon << " tid " << rr->tid << " " << *req << dendl;
-    req->session_mon = whoami;
-    req->session_mon_tid = rr->tid;
+    dout(10) << " resend to mon" << mon << " tid " << rr->tid << " " << *req->msg << dendl;
     req->clear_payload();
     messenger->send_message(req, monmap->get_inst(mon));
   }