]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
bluestore: _get_used_bytes should reflect new mempool fields
authorDeepika Upadhyay <dupadhya@redhat.com>
Wed, 20 May 2020 20:32:02 +0000 (02:02 +0530)
committerIgor Fedotov <ifedotov@suse.com>
Sun, 20 Sep 2020 10:19:07 +0000 (13:19 +0300)
with bluestore_cache_other split further, the _get_used_bytes should
take into account the new mempool splits as well.

see also: 0ce8ee4b123eacfc2bfb14f554487e928512415a
  68ee931fd4b6bf748f95b14dae31d11738fbaf1e

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit d9f84b41eff99357585f27c89449e379a28a9212)

src/os/bluestore/BlueStore.h

index d6c958b8f28cb021d1a852839fbe1123c2340ef5..99976265f33225a3abf39d1570d4885f8c58adde 100644 (file)
@@ -2161,9 +2161,13 @@ private:
       MetaCache(BlueStore *s) : MempoolCache(s) {};
 
       virtual uint64_t _get_used_bytes() const {
-       return mempool::bluestore_cache_meta::allocated_bytes() +
-              mempool::bluestore_cache_other::allocated_bytes() +
-              mempool::bluestore_cache_onode::allocated_bytes();
+        return mempool::bluestore_Buffer::allocated_bytes() +
+          mempool::bluestore_Blob::allocated_bytes() +
+          mempool::bluestore_Extent::allocated_bytes() +
+          mempool::bluestore_cache_meta::allocated_bytes() +
+          mempool::bluestore_cache_other::allocated_bytes() +
+          mempool::bluestore_SharedBlob::allocated_bytes() +
+          mempool::bluestore_inline_bl::allocated_bytes();
       }
 
       virtual string get_cache_name() const {