gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-01 22:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

crimson/os/seastore/lba,TM: remove shadows when trimming dirty non-data

Browse Source 
extents

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
This commit is contained in:
Xuehan Xu 2026-06-03 17:36:42 +08:00
parent a9220d9470
commit a5693801a6
4 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/crimson/os/seastore/async_cleaner.cc
View File

@ -717,8 +717,11 @@ JournalTrimmerImpl::trim_dirty()
return trans_intr::do_for_each(
dirty_list,
[this, &t](auto &e) {
return extent_callback->rewrite_extent(
return extent_callback->maybe_remove_shadow(t, *e
).si_then([this, &t, e] {
return extent_callback->rewrite_extent(
t, e, INIT_GENERATION, NULL_TIME);
});
});
});
}).si_then([this, &t] {

12
src/crimson/os/seastore/async_cleaner.h
View File

@ -398,6 +398,18 @@ public:
laddr_t prefix,
std::size_t max_proceed_size) = 0;
/**
* maybe_remove_shadow
*
* Remove the shadow of the extent if it exists
*/
using maybe_remove_shadow_iertr = base_iertr;
using maybe_remove_shadow_ret =
maybe_remove_shadow_iertr::future<>;
virtual maybe_remove_shadow_ret maybe_remove_shadow(
Transaction &t,
CachedExtent &e) = 0;
/**
* get_extents_if_live
*

5
src/crimson/os/seastore/lba/btree_lba_manager.cc
View File

@ -1139,6 +1139,11 @@ BtreeLBAManager::update_mappings(
ceph_assert(in.len == len);
if (likely(in.pladdr.get_paddr() == prev_addr)) {
ret.pladdr = addr;
if (c.trans.get_src() == transaction_type_t::TRIM_DIRTY) {
// This is a dirty onode/omap extent that are rewritten,
// the shadow extent should be removed.
ret.shadow_paddr = P_ADDR_NULL;
}
} else {
// this can only happen when the extent is EXIST_CLEAN
// and is demoted onto the cold tier by a DEMOTE trans.

36
src/crimson/os/seastore/transaction_manager.h
View File

@ -993,6 +993,42 @@ public:
laddr_t start,
std::size_t max_proceed_size) final;
maybe_remove_shadow_ret maybe_remove_shadow(
Transaction &t,
CachedExtent &e) {
if (!e.is_logical()) {
co_return;
}
auto &extent = static_cast<LogicalChildNode&>(e);
auto cursor = co_await lba_manager->get_cursor(t, extent
).handle_error_interruptible(
crimson::ct_error::input_output_error::pass_further{},
crimson::ct_error::enoent::assert_failure{}
);
if (cursor->has_shadow_paddr()) {
if (auto shadow = extent.get_shadow(); shadow) {
cache->retire_extent(t, shadow);
} else {
auto laddr = cursor->get_laddr();
std::ignore = cache->retire_absent_extent_addr_by_type(
t, laddr,
cursor->get_shadow_paddr(),
cursor->get_length(),
cursor->get_extent_type(),
[&extent, laddr](auto &ext) {
auto lextent = ext.template cast<LogicalChildNode>();
assert(ext.is_logical());
assert(!lextent->has_laddr());
assert(!ext.has_been_invalidated());
lextent->set_laddr(laddr);
ext.set_shadow_extent(true);
extent.set_shadow(lextent);
}
);
}
}
}
using ExtentCallbackInterface::get_extents_if_live_ret;
get_extents_if_live_ret get_extents_if_live(
Transaction &t,