From: Sage Weil <sage@redhat.com>
Date: Mon, 29 May 2017 20:55:28 +0000 (-0400)
Subject: osd: (loosely) mark cached map bl buffers as osd_mapbl
X-Git-Tag: v12.1.0~334^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19658608109facbf189bb9d3c6305aad0dda1750;p=ceph-ci.git

osd: (loosely) mark cached map bl buffers as osd_mapbl

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

diff --git a/src/include/mempool.h b/src/include/mempool.h
index 4a64faffbac..f7aecece592 100644
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -146,6 +146,7 @@ namespace mempool {
   f(buffer_anon)		      \
   f(buffer_meta)		      \
   f(osd)			      \
+  f(osd_mapbl)			      \
   f(osdmap)			      \
   f(osdmap_mapping)
 
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index df1b4bea9ae..ec7b565f0d6 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1471,12 +1471,14 @@ bool OSDService::get_inc_map_bl(epoch_t e, bufferlist& bl)
 void OSDService::_add_map_bl(epoch_t e, bufferlist& bl)
 {
   dout(10) << "add_map_bl " << e << " " << bl.length() << " bytes" << dendl;
+  bl.try_assign_to_mempool(mempool::mempool_osd_mapbl);
   map_bl_cache.add(e, bl);
 }
 
 void OSDService::_add_map_inc_bl(epoch_t e, bufferlist& bl)
 {
   dout(10) << "add_map_inc_bl " << e << " " << bl.length() << " bytes" << dendl;
+  bl.try_assign_to_mempool(mempool::mempool_osd_mapbl);
   map_bl_inc_cache.add(e, bl);
 }