From: Sage Weil <sage@redhat.com>
Date: Fri, 14 Apr 2017 17:21:38 +0000 (-0400)
Subject: osd: fix occasional MOSDMap leak
X-Git-Tag: v11.2.1~84^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62bb2086af2f0d63c081a8a0b9d1de8d1c1179a7;p=ceph.git

osd: fix occasional MOSDMap leak

_committed_osd_maps() may return early (without putting
the ref) on shutdown.

Fixes: http://tracker.ceph.com/issues/18293
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a74632f964e10a57fb8065aec90dc7b69bddba5b)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3b62ef3755b..3c79e17483e 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6717,6 +6717,7 @@ struct C_OnMapCommit : public Context {
     : osd(o), first(f), last(l), msg(m) {}
   void finish(int r) {
     osd->_committed_osd_maps(first, last, msg);
+    msg->put();
   }
 };
 
@@ -7260,7 +7261,6 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
   else if (do_restart)
     start_boot();
 
-  m->put();
 }
 
 void OSD::check_osdmap_features(ObjectStore *fs)