]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: fix memory accounting in TwoQBufferCacheShard 37580/head
authorAdam Kupczyk <akupczyk@redhat.com>
Wed, 7 Oct 2020 10:34:04 +0000 (06:34 -0400)
committerAdam Kupczyk <akupczyk@redhat.com>
Wed, 7 Oct 2020 10:34:04 +0000 (06:34 -0400)
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 <akupczyk@redhat.com>
src/os/bluestore/BlueStore.cc

index d086685c584ba82b72a595a08ac97310a19142b5..472f891f4baba2cb32348f116b362f438f63de96 100644 (file)
@@ -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,