From 096ddce76d90e76feef1cedccd9f20156582853c Mon Sep 17 00:00:00 2001 From: Zhang Song Date: Thu, 24 Apr 2025 17:26:57 +0800 Subject: [PATCH] crimson/os/seastore/BackrefManager: adpat new BackrefMapping Signed-off-by: Zhang Song (cherry picked from commit 32a8cf134dfe992db924980344e9b53db79e002f) --- src/crimson/os/seastore/async_cleaner.h | 2 +- .../os/seastore/backref/btree_backref_manager.cc | 12 ++++++------ src/crimson/os/seastore/backref_manager.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/crimson/os/seastore/async_cleaner.h b/src/crimson/os/seastore/async_cleaner.h index 1cef771aeb8..b17a4bd5be5 100644 --- a/src/crimson/os/seastore/async_cleaner.h +++ b/src/crimson/os/seastore/async_cleaner.h @@ -1487,7 +1487,7 @@ private: using do_reclaim_space_ret = do_reclaim_space_ertr::future<>; do_reclaim_space_ret do_reclaim_space( const std::vector &backref_extents, - const backref_pin_list_t &pin_list, + const backref_mapping_list_t &pin_list, std::size_t &reclaimed, std::size_t &runs); diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.cc b/src/crimson/os/seastore/backref/btree_backref_manager.cc index 92f9f30bb63..bf70daa81f6 100644 --- a/src/crimson/os/seastore/backref/btree_backref_manager.cc +++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc @@ -91,7 +91,7 @@ BtreeBackrefManager::get_mapping( LOG_PREFIX(BtreeBackrefManager::get_mapping); TRACET("{}", t, offset); auto c = get_context(t); - return with_btree_ret( + return with_btree_ret( cache, c, [c, offset](auto &btree) { @@ -107,7 +107,7 @@ BtreeBackrefManager::get_mapping( c.trans, offset, iter.get_key(), iter.get_val()); return get_mapping_ret( interruptible::ready_future_marker{}, - iter.get_pin(c)); + BackrefMapping::create(iter.get_cursor(c))); } }); }); @@ -122,7 +122,7 @@ BtreeBackrefManager::get_mappings( LOG_PREFIX(BtreeBackrefManager::get_mappings); TRACET("{}~{}", t, offset, end); auto c = get_context(t); - return with_btree_state( + return with_btree_state( cache, c, [c, offset, end](auto &btree, auto &ret) { @@ -141,7 +141,7 @@ BtreeBackrefManager::get_mappings( TRACET("{}~{} got {}, {}, repeat ...", c.trans, offset, end, pos.get_key(), pos.get_val()); ceph_assert((pos.get_key().add_offset(pos.get_val().len)) > offset); - ret.emplace_back(pos.get_pin(c)); + ret.emplace_back(BackrefMapping::create(pos.get_cursor(c))); return BackrefBtree::iterate_repeat_ret_inner( interruptible::ready_future_marker{}, seastar::stop_iteration::no); @@ -237,8 +237,8 @@ BtreeBackrefManager::new_mapping( }); }); }).si_then([c](auto &&state) { - return new_mapping_iertr::make_ready_future( - state.ret->get_pin(c)); + return new_mapping_iertr::make_ready_future( + BackrefMapping::create(state.ret->get_cursor(c))); }); } diff --git a/src/crimson/os/seastore/backref_manager.h b/src/crimson/os/seastore/backref_manager.h index 8c746b571b2..7a263884f77 100644 --- a/src/crimson/os/seastore/backref_manager.h +++ b/src/crimson/os/seastore/backref_manager.h @@ -30,7 +30,7 @@ public: * Future will not resolve until all pins have resolved */ using get_mappings_iertr = base_iertr; - using get_mappings_ret = get_mappings_iertr::future; + using get_mappings_ret = get_mappings_iertr::future; virtual get_mappings_ret get_mappings( Transaction &t, paddr_t offset, @@ -43,7 +43,7 @@ public: */ using get_mapping_iertr = base_iertr::extend< crimson::ct_error::enoent>; - using get_mapping_ret = get_mapping_iertr::future; + using get_mapping_ret = get_mapping_iertr::future; virtual get_mapping_ret get_mapping( Transaction &t, paddr_t offset) = 0; @@ -63,7 +63,7 @@ public: * Insert new paddr_t -> laddr_t mapping */ using new_mapping_iertr = base_iertr; - using new_mapping_ret = new_mapping_iertr::future; + using new_mapping_ret = new_mapping_iertr::future; virtual new_mapping_ret new_mapping( Transaction &t, paddr_t key, -- 2.39.5