common/mempool: More detailed bluestore stats

Splits bluestore bluestore_cache_other, exposes accounting of some internals.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>

diff --git a/src/include/mempool.h b/src/include/mempool.h
index 1f597b8c42dab94cc3589ddb316dc35303700ffd..d03469dbaf6c0db174395a8868e90e07939cfa8c 100644 (file)
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -153,6 +153,11 @@ namespace mempool {
   f(bluestore_cache_onode)           \
   f(bluestore_cache_meta)            \
   f(bluestore_cache_other)           \
+  f(bluestore_Buffer)                \
+  f(bluestore_Extent)                \
+  f(bluestore_Blob)                  \
+  f(bluestore_SharedBlob)            \
+  f(bluestore_inline_bl)             \
   f(bluestore_fsck)                  \
   f(bluestore_txc)                   \
   f(bluestore_writing_deferred)      \

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 42f2b56c9c130a5043b2fa2ba7854cf367c36f35..55615a6d59a6fc6d114c79105103c7492473d857 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -67,13 +67,13 @@ MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Onode, bluestore_onode,
 
 // bluestore_cache_other
 MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Buffer, bluestore_buffer,
-                             bluestore_cache_other);
+                             bluestore_Buffer);
 MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Extent, bluestore_extent,
-                             bluestore_cache_other);
+                             bluestore_Extent);
 MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Blob, bluestore_blob,
-                             bluestore_cache_other);
+                             bluestore_Blob);
 MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::SharedBlob, bluestore_shared_blob,
-                             bluestore_cache_other);
+                             bluestore_SharedBlob);
 
 // bluestore_txc
 MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::TransContext, bluestore_transcontext,
@@ -2235,7 +2235,7 @@ void BlueStore::ExtentMap::update(KeyValueDB::Transaction t,
       unsigned n;
       // we need to encode inline_bl to measure encoded length
       bool never_happen = encode_some(0, OBJECT_MAX_SIZE, inline_bl, &n);
-      inline_bl.reassign_to_mempool(mempool::mempool_bluestore_cache_other);
+      inline_bl.reassign_to_mempool(mempool::mempool_bluestore_inline_bl);
       ceph_assert(!never_happen);
       size_t len = inline_bl.length();
       dout(20) << __func__ << "  inline shard " << len << " bytes from " << n