crimson/os/seastore/cached_extent: more correctness asserts

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

diff --git a/src/crimson/os/seastore/btree/btree_types.cc b/src/crimson/os/seastore/btree/btree_types.cc
index f2a473d1546025f85bc9f6318e60cf4dd8b206c2..1da13bf622c28c3b51e17490e0ec3e735c291430 100644 (file)
--- a/src/crimson/os/seastore/btree/btree_types.cc
+++ b/src/crimson/os/seastore/btree/btree_types.cc
@@ -134,7 +134,6 @@ bool BtreeCursor<key_t, val_t>::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 c6144b72f204fe908ff9c7b0716c72b4f72b4698..85b29ba4e979dd8144512964ca16286b39cc38ef 100644 (file)
--- 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<bool, CachedExtent::viewable_state_t>
 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 b4c8975cbff5c61a73997ac9b3aa2eab259c1d0f..2ac55b3405c805fc4075fca3252753460764514b 100644 (file)
--- 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
   };