From 163b51f2efdde0735a7459ad44fb574d3d2d6b56 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Tue, 26 Jul 2022 14:25:27 +0900 Subject: [PATCH] seastore/rbm: rename NVMeManager to BlockRBManager Signed-off-by: Myoungwon Oh --- src/crimson/os/seastore/CMakeLists.txt | 2 +- .../{nvme_manager.cc => block_rb_manager.cc} | 88 +++++++++---------- .../{nvme_manager.h => block_rb_manager.h} | 6 +- .../seastore/test_randomblock_manager.cc | 6 +- 4 files changed, 51 insertions(+), 51 deletions(-) rename src/crimson/os/seastore/random_block_manager/{nvme_manager.cc => block_rb_manager.cc} (87%) rename src/crimson/os/seastore/random_block_manager/{nvme_manager.h => block_rb_manager.h} (98%) diff --git a/src/crimson/os/seastore/CMakeLists.txt b/src/crimson/os/seastore/CMakeLists.txt index ee3aa47cc5332..408f7b494dc7a 100644 --- a/src/crimson/os/seastore/CMakeLists.txt +++ b/src/crimson/os/seastore/CMakeLists.txt @@ -36,7 +36,7 @@ set(crimson_seastore_srcs extent_placement_manager.cc object_data_handler.cc seastore.cc - random_block_manager/nvme_manager.cc + random_block_manager/block_rb_manager.cc random_block_manager/nvmedevice.cc journal/segmented_journal.cc journal/segment_allocator.cc diff --git a/src/crimson/os/seastore/random_block_manager/nvme_manager.cc b/src/crimson/os/seastore/random_block_manager/block_rb_manager.cc similarity index 87% rename from src/crimson/os/seastore/random_block_manager/nvme_manager.cc rename to src/crimson/os/seastore/random_block_manager/block_rb_manager.cc index 51a8fde12eb83..eff58f8329852 100644 --- a/src/crimson/os/seastore/random_block_manager/nvme_manager.cc +++ b/src/crimson/os/seastore/random_block_manager/block_rb_manager.cc @@ -10,16 +10,16 @@ #include "nvmedevice.h" #include "include/interval_set.h" #include "include/intarith.h" -#include "nvme_manager.h" +#include "block_rb_manager.h" SET_SUBSYS(seastore_device); namespace crimson::os::seastore { -NVMeManager::write_ertr::future<> NVMeManager::rbm_sync_block_bitmap( +BlockRBManager::write_ertr::future<> BlockRBManager::rbm_sync_block_bitmap( rbm_bitmap_block_t &block, blk_no_t block_no) { - LOG_PREFIX(NVMeManager::rbm_sync_block_bitmap); + LOG_PREFIX(BlockRBManager::rbm_sync_block_bitmap); bufferptr bptr; try { bptr = bufferptr(ceph::buffer::create_page_aligned(block.get_size())); @@ -37,9 +37,9 @@ NVMeManager::write_ertr::future<> NVMeManager::rbm_sync_block_bitmap( bptr); } -NVMeManager::mkfs_ertr::future<> NVMeManager::initialize_blk_alloc_area() +BlockRBManager::mkfs_ertr::future<> BlockRBManager::initialize_blk_alloc_area() { - LOG_PREFIX(NVMeManager::initialize_blk_alloc_area); + LOG_PREFIX(BlockRBManager::initialize_blk_alloc_area); auto start = super.start_data_area / super.block_size; DEBUG("initialize_alloc_area: start to read at {} ", start); @@ -95,7 +95,7 @@ NVMeManager::mkfs_ertr::future<> NVMeManager::initialize_blk_alloc_area() mkfs_ertr::pass_further{}, crimson::ct_error::assert_all{ "Invalid error rbm_sync_block_bitmap to update \ - last bitmap block in NVMeManager::initialize_blk_alloc_area" + last bitmap block in BlockRBManager::initialize_blk_alloc_area" } ); } @@ -104,22 +104,22 @@ NVMeManager::mkfs_ertr::future<> NVMeManager::initialize_blk_alloc_area() mkfs_ertr::pass_further{}, crimson::ct_error::assert_all{ "Invalid error rbm_sync_block_bitmap \ - in NVMeManager::initialize_blk_alloc_area" + in BlockRBManager::initialize_blk_alloc_area" } ); }).handle_error( mkfs_ertr::pass_further{}, crimson::ct_error::assert_all{ "Invalid error rbm_sync_block_bitmap_by_range \ - in NVMeManager::initialize_blk_alloc_area" + in BlockRBManager::initialize_blk_alloc_area" } ); }); } -NVMeManager::mkfs_ertr::future<> NVMeManager::mkfs(mkfs_config_t config) +BlockRBManager::mkfs_ertr::future<> BlockRBManager::mkfs(mkfs_config_t config) { - LOG_PREFIX(NVMeManager::mkfs); + LOG_PREFIX(BlockRBManager::mkfs); DEBUG("path {}", path); return _open_device(path).safe_then([this, &config, FNAME]() { rbm_abs_addr addr = convert_paddr_to_abs_addr( @@ -153,12 +153,12 @@ NVMeManager::mkfs_ertr::future<> NVMeManager::mkfs(mkfs_config_t config) }).handle_error( mkfs_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error write_rbm_header in NVMeManager::mkfs" + "Invalid error write_rbm_header in BlockRBManager::mkfs" }); }), mkfs_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error read_rbm_header in NVMeManager::mkfs" + "Invalid error read_rbm_header in BlockRBManager::mkfs" } ); }).safe_then([this]() { @@ -172,13 +172,13 @@ NVMeManager::mkfs_ertr::future<> NVMeManager::mkfs(mkfs_config_t config) }).handle_error( mkfs_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error open_device in NVMeManager::mkfs" + "Invalid error open_device in BlockRBManager::mkfs" }); } -NVMeManager::find_block_ret NVMeManager::find_free_block(Transaction &t, size_t size) +BlockRBManager::find_block_ret BlockRBManager::find_free_block(Transaction &t, size_t size) { - LOG_PREFIX(NVMeManager::find_free_block); + LOG_PREFIX(BlockRBManager::find_free_block); auto bp = bufferptr(ceph::buffer::create_page_aligned(super.block_size)); return seastar::do_with(uint64_t(0), uint64_t(super.start_alloc_area), @@ -243,14 +243,14 @@ NVMeManager::find_block_ret NVMeManager::find_free_block(Transaction &t, size_t }).handle_error( find_block_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error in NVMeManager::find_free_block" + "Invalid error in BlockRBManager::find_free_block" } ); }); } /* TODO : block allocator */ -NVMeManager::allocate_ret NVMeManager::alloc_extent( +BlockRBManager::allocate_ret BlockRBManager::alloc_extent( Transaction &t, size_t size) { @@ -263,7 +263,7 @@ NVMeManager::allocate_ret NVMeManager::alloc_extent( * just read the block bitmap directly to find free blocks. * */ - LOG_PREFIX(NVMeManager::alloc_extent); + LOG_PREFIX(BlockRBManager::alloc_extent); return find_free_block(t, size ).safe_then([this, FNAME](auto alloc_extent) mutable -> allocate_ertr::future { @@ -280,12 +280,12 @@ NVMeManager::allocate_ret NVMeManager::alloc_extent( }).handle_error( allocate_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error find_free_block in NVMeManager::alloc_extent" + "Invalid error find_free_block in BlockRBManager::alloc_extent" } ); } -void NVMeManager::add_free_extent( +void BlockRBManager::add_free_extent( std::vector& v, rbm_abs_addr from, size_t len) { ceph_assert(!(len % super.block_size)); @@ -299,10 +299,10 @@ void NVMeManager::add_free_extent( v.push_back(alloc_info); } -NVMeManager::write_ertr::future<> NVMeManager::rbm_sync_block_bitmap_by_range( +BlockRBManager::write_ertr::future<> BlockRBManager::rbm_sync_block_bitmap_by_range( blk_no_t start, blk_no_t end, bitmap_op_types_t op) { - LOG_PREFIX(NVMeManager::rbm_sync_block_bitmap_by_range); + LOG_PREFIX(BlockRBManager::rbm_sync_block_bitmap_by_range); auto addr = super.start_alloc_area + (start / max_block_by_bitmap_block()) * super.block_size; @@ -394,18 +394,18 @@ NVMeManager::write_ertr::future<> NVMeManager::rbm_sync_block_bitmap_by_range( }).handle_error( write_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error in NVMeManager::rbm_sync_block_bitmap_by_range" + "Invalid error in BlockRBManager::rbm_sync_block_bitmap_by_range" } ); }).handle_error( write_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error in NVMeManager::rbm_sync_block_bitmap_by_range" + "Invalid error in BlockRBManager::rbm_sync_block_bitmap_by_range" } ); } -NVMeManager::abort_allocation_ertr::future<> NVMeManager::abort_allocation( +BlockRBManager::abort_allocation_ertr::future<> BlockRBManager::abort_allocation( Transaction &t) { /* @@ -414,16 +414,16 @@ NVMeManager::abort_allocation_ertr::future<> NVMeManager::abort_allocation( return abort_allocation_ertr::now(); } -NVMeManager::write_ertr::future<> NVMeManager::complete_allocation( +BlockRBManager::write_ertr::future<> BlockRBManager::complete_allocation( Transaction &t) { return write_ertr::now(); } -NVMeManager::write_ertr::future<> NVMeManager::sync_allocation( +BlockRBManager::write_ertr::future<> BlockRBManager::sync_allocation( std::vector &alloc_blocks) { - LOG_PREFIX(NVMeManager::sync_allocation); + LOG_PREFIX(BlockRBManager::sync_allocation); if (alloc_blocks.empty()) { return write_ertr::now(); } @@ -474,10 +474,10 @@ NVMeManager::write_ertr::future<> NVMeManager::sync_allocation( }); } -NVMeManager::open_ertr::future<> NVMeManager::open( +BlockRBManager::open_ertr::future<> BlockRBManager::open( const std::string &path, paddr_t paddr) { - LOG_PREFIX(NVMeManager::open); + LOG_PREFIX(BlockRBManager::open); DEBUG("open: path{}", path); rbm_abs_addr addr = convert_paddr_to_abs_addr(paddr); return _open_device(path @@ -494,13 +494,13 @@ NVMeManager::open_ertr::future<> NVMeManager::open( }).handle_error( open_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error read_rbm_header in NVMeManager::open" + "Invalid error read_rbm_header in BlockRBManager::open" } ); }); } -NVMeManager::write_ertr::future<> NVMeManager::write( +BlockRBManager::write_ertr::future<> BlockRBManager::write( paddr_t paddr, bufferptr &bptr) { @@ -515,7 +515,7 @@ NVMeManager::write_ertr::future<> NVMeManager::write( bptr); } -NVMeManager::read_ertr::future<> NVMeManager::read( +BlockRBManager::read_ertr::future<> BlockRBManager::read( paddr_t paddr, bufferptr &bptr) { @@ -530,20 +530,20 @@ NVMeManager::read_ertr::future<> NVMeManager::read( bptr); } -NVMeManager::close_ertr::future<> NVMeManager::close() +BlockRBManager::close_ertr::future<> BlockRBManager::close() { ceph_assert(device); return device->close(); } -NVMeManager::open_ertr::future<> NVMeManager::_open_device( +BlockRBManager::open_ertr::future<> BlockRBManager::_open_device( const std::string path) { ceph_assert(device); return device->open(path, seastar::open_flags::rw); } -NVMeManager::write_ertr::future<> NVMeManager::write_rbm_header() +BlockRBManager::write_ertr::future<> BlockRBManager::write_rbm_header() { bufferlist meta_b_header; super.crc = 0; @@ -568,10 +568,10 @@ NVMeManager::write_ertr::future<> NVMeManager::write_rbm_header() return device->write(super.start, bp); } -NVMeManager::read_ertr::future NVMeManager::read_rbm_header( +BlockRBManager::read_ertr::future BlockRBManager::read_rbm_header( rbm_abs_addr addr) { - LOG_PREFIX(NVMeManager::read_rbm_header); + LOG_PREFIX(BlockRBManager::read_rbm_header); ceph_assert(device); bufferptr bptr = bufferptr(ceph::buffer::create_page_aligned(RBM_SUPERBLOCK_SIZE)); @@ -614,14 +614,14 @@ NVMeManager::read_ertr::future NVMeManager::read_rbm_head }).handle_error( read_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error in NVMeManager::read_rbm_header" + "Invalid error in BlockRBManager::read_rbm_header" } ); } -NVMeManager::check_bitmap_blocks_ertr::future<> NVMeManager::check_bitmap_blocks() +BlockRBManager::check_bitmap_blocks_ertr::future<> BlockRBManager::check_bitmap_blocks() { - LOG_PREFIX(NVMeManager::check_bitmap_blocks); + LOG_PREFIX(BlockRBManager::check_bitmap_blocks); auto bp = bufferptr(ceph::buffer::create_page_aligned(super.block_size)); return seastar::do_with(uint64_t(super.start_alloc_area), uint64_t(0), bp, [&, this, FNAME](auto &addr, auto &free_blocks, auto &bp) mutable { @@ -653,17 +653,17 @@ NVMeManager::check_bitmap_blocks_ertr::future<> NVMeManager::check_bitmap_blocks }).handle_error( check_bitmap_blocks_ertr::pass_further{}, crimson::ct_error::assert_all{ - "Invalid error in NVMeManager::find_free_block" + "Invalid error in BlockRBManager::find_free_block" } ); }); } -NVMeManager::write_ertr::future<> NVMeManager::write( +BlockRBManager::write_ertr::future<> BlockRBManager::write( rbm_abs_addr addr, bufferlist &bl) { - LOG_PREFIX(NVMeManager::write); + LOG_PREFIX(BlockRBManager::write); ceph_assert(device); bufferptr bptr; try { diff --git a/src/crimson/os/seastore/random_block_manager/nvme_manager.h b/src/crimson/os/seastore/random_block_manager/block_rb_manager.h similarity index 98% rename from src/crimson/os/seastore/random_block_manager/nvme_manager.h rename to src/crimson/os/seastore/random_block_manager/block_rb_manager.h index 20f0087a72757..0b46355d52441 100644 --- a/src/crimson/os/seastore/random_block_manager/nvme_manager.h +++ b/src/crimson/os/seastore/random_block_manager/block_rb_manager.h @@ -173,7 +173,7 @@ WRITE_CLASS_DENC_BOUNDED( namespace crimson::os::seastore { -class NVMeManager final : public RandomBlockManager { +class BlockRBManager final : public RandomBlockManager { public: /* * Ondisk layout @@ -294,7 +294,7 @@ public: * on a device, so start and end location of the device are needed to * support such case. */ - NVMeManager(NVMeBlockDevice * device, std::string path) + BlockRBManager(NVMeBlockDevice * device, std::string path) : device(device), path(path) {} /* @@ -374,6 +374,6 @@ private: std::string path; int stream_id; // for multi-stream }; -using NVMeManagerRef = std::unique_ptr; +using BlockRBManagerRef = std::unique_ptr; } diff --git a/src/test/crimson/seastore/test_randomblock_manager.cc b/src/test/crimson/seastore/test_randomblock_manager.cc index dafdcdee8ab68..8696828f2c722 100644 --- a/src/test/crimson/seastore/test_randomblock_manager.cc +++ b/src/test/crimson/seastore/test_randomblock_manager.cc @@ -6,7 +6,7 @@ #include #include "crimson/common/log.h" -#include "crimson/os/seastore/random_block_manager/nvme_manager.h" +#include "crimson/os/seastore/random_block_manager/block_rb_manager.h" #include "crimson/os/seastore/random_block_manager/nvmedevice.h" #include "test/crimson/seastore/transaction_manager_test_state.h" @@ -25,7 +25,7 @@ constexpr uint64_t DEFAULT_BLOCK_SIZE = 4096; struct rbm_test_t : public seastar_test_suite_t, TMTestState { - std::unique_ptr rbm_manager; + std::unique_ptr rbm_manager; std::unique_ptr device; struct rbm_transaction { @@ -54,7 +54,7 @@ struct rbm_test_t : seastar::future<> set_up_fut() final { device.reset(new nvme_device::TestMemory(DEFAULT_TEST_SIZE)); - rbm_manager.reset(new NVMeManager(device.get(), std::string())); + rbm_manager.reset(new BlockRBManager(device.get(), std::string())); device_id_t d_id = 1 << (std::numeric_limits::digits - 1); config.start = paddr_t::make_blk_paddr(d_id, 0); config.end = paddr_t::make_blk_paddr(d_id, DEFAULT_TEST_SIZE); -- 2.39.5