From 952e486a09c09e30c085123887f78f1678aa578d Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Fri, 6 Jun 2025 20:37:40 +0800 Subject: [PATCH] crimson/os/seastore/cached_extent: more correctness asserts Signed-off-by: Xuehan Xu --- src/crimson/os/seastore/btree/btree_types.cc | 1 - src/crimson/os/seastore/cached_extent.cc | 6 +----- src/crimson/os/seastore/cached_extent.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/crimson/os/seastore/btree/btree_types.cc b/src/crimson/os/seastore/btree/btree_types.cc index f2a473d1546..1da13bf622c 100644 --- a/src/crimson/os/seastore/btree/btree_types.cc +++ b/src/crimson/os/seastore/btree/btree_types.cc @@ -134,7 +134,6 @@ bool BtreeCursor::is_viewable() const { } auto [viewable, state] = parent->is_viewable_by_trans(ctx.trans); - assert(state != CachedExtent::viewable_state_t::invalid); SUBTRACET(seastore_cache, "{} with viewable state {}", ctx.trans, *parent, state); return viewable; diff --git a/src/crimson/os/seastore/cached_extent.cc b/src/crimson/os/seastore/cached_extent.cc index c6144b72f20..85b29ba4e97 100644 --- a/src/crimson/os/seastore/cached_extent.cc +++ b/src/crimson/os/seastore/cached_extent.cc @@ -104,9 +104,7 @@ void CachedExtent::set_invalid(Transaction &t) { std::pair CachedExtent::is_viewable_by_trans(Transaction &t) { - if (!is_valid()) { - return std::make_pair(false, viewable_state_t::invalid); - } + ceph_assert(is_valid()); auto trans_id = t.get_trans_id(); if (is_pending()) { @@ -142,8 +140,6 @@ std::ostream &operator<<( return out << "stable"; case CachedExtent::viewable_state_t::pending: return out << "pending"; - case CachedExtent::viewable_state_t::invalid: - return out << "invalid"; case CachedExtent::viewable_state_t::stable_become_retired: return out << "stable_become_retired"; case CachedExtent::viewable_state_t::stable_become_pending: diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h index b4c8975cbff..2ac55b3405c 100644 --- a/src/crimson/os/seastore/cached_extent.h +++ b/src/crimson/os/seastore/cached_extent.h @@ -806,7 +806,6 @@ public: enum class viewable_state_t { stable, // viewable pending, // viewable - invalid, // unviewable stable_become_retired, // unviewable stable_become_pending, // unviewable }; -- 2.39.5