From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Wed, 20 May 2020 20:32:02 +0000 (+0530)
Subject: bluestore: _get_used_bytes should reflect new mempool fields
X-Git-Tag: v15.2.9~122^2~66^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fac602cf904ee2af344b0abfce9696b3f7b884a;p=ceph.git

bluestore: _get_used_bytes should reflect new mempool fields

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)
---

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index d6c958b8f28c..99976265f332 100644
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -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 {