From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Apr 2017 22:26:08 +0000 (-0400)
Subject: osd/OSDMap: put OSDMap[::Incremental] itself in mempool too
X-Git-Tag: v12.0.3~234^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14780%2Fhead;p=ceph.git

osd/OSDMap: put OSDMap[::Incremental] itself in mempool too

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 10223af137e3..9fb9000a0dc3 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -30,6 +30,10 @@
  
 #define dout_subsys ceph_subsys_osd
 
+MEMPOOL_DEFINE_OBJECT_FACTORY(OSDMap, osdmap, osdmap);
+MEMPOOL_DEFINE_OBJECT_FACTORY(OSDMap::Incremental, osdmap_inc, osdmap);
+
+
 // ----------------------------------
 // osd_info_t
 
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 691a413b60e3..aa431389dc0b 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -117,10 +117,13 @@ ostream& operator<<(ostream& out, const osd_xinfo_t& xi);
 /** OSDMap
  */
 class OSDMap {
-
 public:
+  MEMPOOL_CLASS_HELPERS();
+
   class Incremental {
   public:
+    MEMPOOL_CLASS_HELPERS();
+
     /// feature bits we were encoded with.  the subsequent OSDMap
     /// encoding should match.
     uint64_t encode_features;