From e6d9985b8c30ee0093ebb81f9bed8ee0eb0564cb Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Wed, 15 Apr 2020 17:40:15 +0530 Subject: [PATCH] Introduce separate mempool for FileReaderBuffer and FileWriter FileReaderBuffer and FileWriter uses Bufferlists which needs to be tracked by mempool to get the proper memory usage. Signed-off-by: Deepika Upadhyay (cherry picked from commit 9bb741c12cf1ffe3e9fec8e0d2fbaae107947215) Conflicts: src/os/bluestore/BlueFS.cc trivial --- src/os/bluestore/BlueFS.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index f7a6292318f..2dc82b89a90 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -19,10 +19,10 @@ MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::File, bluefs_file, bluefs); MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::Dir, bluefs_dir, bluefs); -MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::FileWriter, bluefs_file_writer, bluefs); +MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::FileWriter, bluefs_file_writer, bluefs_file_writer); MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::FileReaderBuffer, - bluefs_file_reader_buffer, bluefs); -MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::FileReader, bluefs_file_reader, bluefs); + bluefs_file_reader_buffer, bluefs_file_reader); +MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::FileReader, bluefs_file_reader, bluefs_file_reader); MEMPOOL_DEFINE_OBJECT_FACTORY(BlueFS::FileLock, bluefs_file_lock, bluefs); static void wal_discard_cb(void *priv, void* priv2) { @@ -1289,6 +1289,7 @@ int BlueFS::device_migrate_to_existing( ceph_assert(cur_len > 0); cur.substr_of(bl, off, cur_len); int r = bdev[dev_target]->write(i.offset, cur, buffered); + cur.reassign_to_mempool(mempool::mempool_bluefs_file_writer); ceph_assert(r == 0); off += cur_len; } @@ -1601,6 +1602,7 @@ int BlueFS::_read_random( buf->pos += r; } } + buf->bl.reassign_to_mempool(mempool::mempool_bluefs_file_reader); dout(20) << __func__ << " got " << ret << dendl; --h->file->num_reading; return ret; @@ -1711,6 +1713,7 @@ int BlueFS::_read( buf->pos += r; } + buf->bl.reassign_to_mempool(mempool::mempool_bluefs_file_reader); dout(20) << __func__ << " got " << ret << dendl; ceph_assert(!outbl || (int)outbl->length() == ret); --h->file->num_reading; @@ -2941,6 +2944,7 @@ int BlueFS::open_for_write( } } + (*h)->buffer.reassign_to_mempool(mempool::mempool_bluefs_file_writer); dout(10) << __func__ << " h " << *h << " on " << file->fnode << dendl; return 0; } -- 2.47.3