os/bluestore: mark buffer caches buffers as bluestore_data

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

diff --git a/src/include/mempool.h b/src/include/mempool.h
index e75fedd2a125c18f3c7cc561239d9149bce9ef57..4a64faffbac0707cc8f1d5af4140a3357b9cb9da 100644 (file)
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -137,10 +137,11 @@ namespace mempool {
 
 #define DEFINE_MEMORY_POOLS_HELPER(f) \
   f(bloom_filter)                    \
-  f(bluestore_meta_onode)            \
-  f(bluestore_meta_other)            \
   f(bluestore_alloc)                 \
+  f(bluestore_data)                  \
   f(bluestore_fsck)                  \
+  f(bluestore_meta_onode)            \
+  f(bluestore_meta_other)            \
   f(bluefs)                          \
   f(buffer_anon)                     \
   f(buffer_meta)                     \

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index a9db4e509a5096b02cad72d71fe7a243b917dca5..cc096450c7edd9cdeba605ef14b3c78eb38ec3e7 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -265,6 +265,7 @@ public:
       } else {
        cache->_add_buffer(b, level, near);
       }
+      b->data.reassign_to_mempool(mempool::mempool_bluestore_data);
       cache->_audit("_add_buffer end");
     }
     void _rm_buffer(Cache* cache, Buffer *b) {