From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Thu, 8 Sep 2011 16:49:11 +0000 (-0700)
Subject: osd: clean up leak on old/unneeded peering messages
X-Git-Tag: v0.35~51^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11021e8da518113b7a4003b2181272f8fd5dc708;p=ceph.git

osd: clean up leak on old/unneeded peering messages

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 90397f428509..99e97e353532 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4134,6 +4134,8 @@ void OSD::handle_pg_notify(MOSDPGNotify *m)
     if (pg->old_peering_msg(m->get_epoch())) {
       dout(10) << "ignoring old peering message " << *m << dendl;
       pg->unlock();
+      delete t;
+      delete fin;
       continue;
     }
 
@@ -4179,6 +4181,8 @@ void OSD::handle_pg_log(MOSDPGLog *m)
   if (pg->old_peering_msg(m->get_epoch())) {
     dout(10) << "ignoring old peering message " << *m << dendl;
     pg->unlock();
+    delete t;
+    delete fin;
     return;
   }
 
@@ -4224,6 +4228,8 @@ void OSD::handle_pg_info(MOSDPGInfo *m)
     if (pg->old_peering_msg(m->get_epoch())) {
       dout(10) << "ignoring old peering message " << *m << dendl;
       pg->unlock();
+      delete t;
+      delete fin;
       continue;
     }