From bbfa540da8e22629265984b00171c1e0b4fd5c1f Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 27 May 2022 16:32:06 +0800 Subject: [PATCH] crimson/os/seastore: cleanup rewrite_extent() Signed-off-by: Yingxin Cheng --- .../os/seastore/backref/btree_backref_manager.cc | 8 -------- src/crimson/os/seastore/transaction_manager.cc | 14 +++++++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.cc b/src/crimson/os/seastore/backref/btree_backref_manager.cc index de2f14f8ac074..235cbc32ac709 100644 --- a/src/crimson/os/seastore/backref/btree_backref_manager.cc +++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc @@ -351,14 +351,6 @@ BtreeBackrefManager::rewrite_extent( Transaction &t, CachedExtentRef extent) { - LOG_PREFIX(BtreeBackrefManager::rewrite_extent); - auto updated = cache.update_extent_from_transaction(t, extent); - if (!updated) { - DEBUGT("extent is already retired, skipping -- {}", t, *extent); - return rewrite_extent_iertr::now(); - } - extent = updated; - auto c = get_context(t); return with_btree( cache, diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc index f52f59089f992..10185dbb34a40 100644 --- a/src/crimson/os/seastore/transaction_manager.cc +++ b/src/crimson/os/seastore/transaction_manager.cc @@ -482,7 +482,7 @@ TransactionManager::rewrite_logical_extent( nlextent->set_pin(lextent->get_pin().duplicate()); nlextent->last_modified = lextent->last_modified; - DEBUGT("rewriting extent -- {} to {}", t, *lextent, *nlextent); + DEBUGT("rewriting logical extent -- {} to {}", t, *lextent, *nlextent); /* This update_mapping is, strictly speaking, unnecessary for delayed_alloc * extents since we're going to do it again once we either do the ool write @@ -501,11 +501,6 @@ TransactionManager::rewrite_extent_ret TransactionManager::rewrite_extent( { LOG_PREFIX(TransactionManager::rewrite_extent); - if (is_backref_node(extent->get_type())) { - t.get_rewrite_version_stats().increment(extent->get_version()); - return backref_manager->rewrite_extent(t, extent); - } - { auto updated = cache->update_extent_from_transaction(t, extent); if (!updated) { @@ -517,8 +512,13 @@ TransactionManager::rewrite_extent_ret TransactionManager::rewrite_extent( t.get_rewrite_version_stats().increment(extent->get_version()); + if (is_backref_node(extent->get_type())) { + DEBUGT("rewriting backref extent -- {}", t, *extent); + return backref_manager->rewrite_extent(t, extent); + } + if (extent->get_type() == extent_types_t::ROOT) { - DEBUGT("marking root for rewrite -- {}", t, *extent); + DEBUGT("rewriting root extent -- {}", t, *extent); cache->duplicate_for_write(t, extent); return rewrite_extent_iertr::now(); } -- 2.39.5