RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57828 from xxhdx1985126/wip-seastore-btree-better-ut-asserts

Browse Source 
crimson/os/seastore/btree: improve lba pointer related UT checks

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
This commit is contained in:
Yingxin 2024-07-08 10:59:01 +08:00 committed by GitHub
commit 6e63060450
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crimson/os/seastore/btree/fixed_kv_btree.h
View File

@ -511,6 +511,8 @@ public:
&child_node); &child_node);
} else { } else {
if (i->get_val().pladdr.is_laddr()) { if (i->get_val().pladdr.is_laddr()) {
assert(!node->children[i->get_offset()] ||
is_reserved_ptr(node->children[i->get_offset()]));
continue; continue;
} }
ret = c.trans.get_extent( ret = c.trans.get_extent(
@ -586,7 +588,7 @@ public:
: true); : true);
} }
} }
if (child == get_reserved_ptr()) { if (is_reserved_ptr(child)) {
if constexpr( if constexpr(
!std::is_base_of_v<typename internal_node_t::base_t, !std::is_base_of_v<typename internal_node_t::base_t,
child_node_t>) { child_node_t>) {

2
src/crimson/os/seastore/btree/fixed_kv_node.h
View File

@ -130,7 +130,7 @@ struct FixedKVNode : ChildableCachedExtent {
children[offset] = child; children[offset] = child;
set_child_ptracker(child); set_child_ptracker(child);
} else { } else {
// this can only happen when reserving lba spaces // this can happen when reserving lba spaces and cloning mappings
ceph_assert(is_leaf_and_has_children()); ceph_assert(is_leaf_and_has_children());
// this is to avoid mistakenly copying pointers from // this is to avoid mistakenly copying pointers from
// copy sources when committing this lba node, because // copy sources when committing this lba node, because