From: Adam Kupczyk Date: Wed, 7 Oct 2020 10:34:04 +0000 (-0400) Subject: os/bluestore: fix memory accounting in TwoQBufferCacheShard X-Git-Tag: v16.1.0~873^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d302238839cc4f3985152aaa63bd83d06fd540a6;p=ceph.git os/bluestore: fix memory accounting in TwoQBufferCacheShard Variable buffer_bytes has been redefined in TwoQBufferCacheShard, causing PriCache to see always 0 usage when 2q cache was selected, as it looks at it through BufferCacheShard::_get_bytes(). Signed-off-by: Adam Kupczyk --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index d086685c584b..472f891f4bab 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -1211,7 +1211,6 @@ struct TwoQBufferCacheShard : public BlueStore::BufferCacheShard { list_t hot; ///< "Am" hot buffers list_t warm_in; ///< "A1in" newly warm buffers list_t warm_out; ///< "A1out" empty buffers we've evicted - uint64_t buffer_bytes = 0; ///< bytes enum { BUFFER_NEW = 0,