From 97fd8be8d99deae1cd9b70a54c5ec79e88ff4551 Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregf@hq.newdream.net>
Date: Tue, 30 Mar 2010 14:00:55 -0700
Subject: [PATCH] msg: fix uses of MMonPaxos destructor to use put()

---
 src/mon/Monitor.cc |  2 +-
 src/mon/Paxos.cc   | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index cfffbf912a3cc..e1fc583ff41ff 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -690,7 +690,7 @@ bool Monitor::_ms_dispatch(Message *m)
 	if (pm->epoch > mon_epoch) 
 	  call_election();
 	if (pm->epoch != mon_epoch) {
-	  delete pm;
+	  pm->put();
 	  break;
 	}
 
diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index d8ebac6b95af0..9c083944403ff 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -174,7 +174,7 @@ void Paxos::handle_collect(MMonPaxos *collect)
 
   // send reply
   mon->messenger->send_message(last, collect->get_source_inst());
-  delete collect;
+  collect->put();
 }
 
 
@@ -185,7 +185,7 @@ void Paxos::handle_last(MMonPaxos *last)
 
   if (!mon->is_leader()) {
     dout(10) << "not leader, dropping" << dendl;
-    delete last;
+    last->put();
     return;
   }
 
@@ -287,7 +287,7 @@ void Paxos::handle_last(MMonPaxos *last)
     dout(10) << "old pn, ignoring" << dendl;
   }
 
-  delete last;
+  last->put();
 }
 
 void Paxos::collect_timeout()
@@ -363,7 +363,7 @@ void Paxos::handle_begin(MMonPaxos *begin)
   // can we accept this?
   if (begin->pn < accepted_pn) {
     dout(10) << " we accepted a higher pn " << accepted_pn << ", ignoring" << dendl;
-    delete begin;
+    begin->put();
     return;
   }
   assert(begin->pn == accepted_pn);
@@ -384,7 +384,7 @@ void Paxos::handle_begin(MMonPaxos *begin)
   accept->last_committed = last_committed;
   mon->messenger->send_message(accept, begin->get_source_inst());
   
-  delete begin;
+  begin->put();
 }
 
 // leader
@@ -396,13 +396,13 @@ void Paxos::handle_accept(MMonPaxos *accept)
   if (accept->pn != accepted_pn) {
     // we accepted a higher pn, from some other leader
     dout(10) << " we accepted a higher pn " << accepted_pn << ", ignoring" << dendl;
-    delete accept;
+    accept->put();
     return;
   }
   if (last_committed > 0 &&
       accept->last_committed < last_committed-1) {
     dout(10) << " this is from an old round, ignoring" << dendl;
-    delete accept;
+    accept->put();
     return;
   }
   assert(accept->last_committed == last_committed ||   // not committed
@@ -488,7 +488,7 @@ void Paxos::handle_commit(MMonPaxos *commit)
   if (!mon->is_peon()) {
     dout(10) << "not a peon, dropping" << dendl;
     assert(0);
-    delete commit;
+    commit->put();
     return;
   }
 
@@ -508,7 +508,7 @@ void Paxos::handle_commit(MMonPaxos *commit)
     mon->store->sync();
   mon->store->put_int(last_committed, machine_name, "last_committed");
   
-  delete commit;
+  commit->put();
 
   finish_contexts(waiting_for_commit);
 }
@@ -561,7 +561,7 @@ void Paxos::handle_lease(MMonPaxos *lease)
   if (!mon->is_peon() ||
       last_committed != lease->last_committed) {
     dout(10) << "handle_lease i'm not a peon, or they're not the leader, or the last_committed doesn't match, dropping" << dendl;
-    delete lease;
+    lease->put();
     return;
   }
 
@@ -595,7 +595,7 @@ void Paxos::handle_lease(MMonPaxos *lease)
   if (is_readable())
     finish_contexts(waiting_for_readable);
 
-  delete lease;
+  lease->put();
 }
 
 void Paxos::handle_lease_ack(MMonPaxos *ack)
@@ -625,7 +625,7 @@ void Paxos::handle_lease_ack(MMonPaxos *ack)
 	     << " dup (lagging!), ignoring" << dendl;
   }
   
-  delete ack;
+  ack->put();
 }
 
 void Paxos::lease_ack_timeout()
-- 
2.39.5