From 11c8e258e7a1658e5bdf19c1ed4350344f8dfa09 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 15 Sep 2021 18:37:31 -0700 Subject: [PATCH] crimson/os/seastore/cache: rename invalidate(Transaction&, CachedExtent&) This particular overload is really only declaring the Transaction conflicted -- it assumes the extent is already invalid. Rename to mark_transaction_conflicted instead to avoid confusion with invalidate(CachedExtent&). Signed-off-by: Samuel Just --- src/crimson/os/seastore/cache.cc | 7 ++++--- src/crimson/os/seastore/cache.h | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc index 505c6e49566d0..500c327ee1746 100644 --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@ -623,14 +623,15 @@ void Cache::invalidate(CachedExtent &extent) for (auto &&i: extent.transactions) { if (!i.t->conflicted) { assert(!i.t->is_weak()); - invalidate(*i.t, extent); + mark_transaction_conflicted(*i.t, extent); } } DEBUG("invalidate end"); extent.state = CachedExtent::extent_state_t::INVALID; } -void Cache::invalidate(Transaction& t, CachedExtent& conflicting_extent) +void Cache::mark_transaction_conflicted( + Transaction& t, CachedExtent& conflicting_extent) { LOG_PREFIX(Cache::invalidate); assert(!t.conflicted); @@ -1127,7 +1128,7 @@ Cache::get_next_dirty_extents_ret Cache::get_next_dirty_extents( ext->wait_io() ).then_interruptible([FNAME, this, ext, &t, &ret] { if (!ext->is_valid()) { - invalidate(t, *ext); + mark_transaction_conflicted(t, *ext); return; } diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index 0b9ada0ae2143..0305dd8116c8a 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -320,7 +320,7 @@ public: (void)this; // silence incorrect clang warning about capture if (!ref->is_valid()) { DEBUGT("got invalid extent: {}", t, ref); - invalidate(t, *ref); + mark_transaction_conflicted(t, *ref); return get_extent_iertr::make_ready_future>(); } else { DEBUGT( @@ -372,7 +372,7 @@ public: if (!ret->is_valid()) { LOG_PREFIX(Cache::get_extent_by_type); DEBUGT("got invalid extent: {}", t, ret); - invalidate(t, *ret.get()); + mark_transaction_conflicted(t, *ret.get()); return get_extent_ertr::make_ready_future(); } else { t.add_to_read_set(ret); @@ -756,7 +756,8 @@ private: void invalidate(CachedExtent &extent); /// Mark a valid transaction as conflicted - void invalidate(Transaction& t, CachedExtent& conflicting_extent); + void mark_transaction_conflicted( + Transaction& t, CachedExtent& conflicting_extent); /// Introspect transaction when it is being destructed void on_transaction_destruct(Transaction& t); -- 2.39.5