From 29d9c3d58823088f1a6e5dab0aa9663e06bfba65 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Wed, 30 Jun 2021 14:03:29 +0800 Subject: [PATCH] crimson/os/seastore/cache: rename try_construct_record to prepare_record Signed-off-by: Yingxin Cheng --- src/crimson/os/seastore/cache.cc | 4 ++-- src/crimson/os/seastore/cache.h | 4 ++-- src/crimson/os/seastore/transaction_manager.cc | 2 +- src/test/crimson/seastore/test_btree_lba_manager.cc | 2 +- src/test/crimson/seastore/test_seastore_cache.cc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc index 68782dfafcf..e1e557baf40 100644 --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@ -252,9 +252,9 @@ CachedExtentRef Cache::duplicate_for_write( return ret; } -record_t Cache::try_construct_record(Transaction &t) +record_t Cache::prepare_record(Transaction &t) { - LOG_PREFIX(Cache::try_construct_record); + LOG_PREFIX(Cache::prepare_record); DEBUGT("enter", t); // Should be valid due to interruptible future diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index 071bc7e9c10..943975963d4 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -384,11 +384,11 @@ public: ); /** - * try_construct_record + * prepare_record * * Construct the record for Journal from transaction. */ - record_t try_construct_record( + record_t prepare_record( Transaction &t ///< [in, out] current transaction ); diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc index 688e3e80397..603ffc49248 100644 --- a/src/crimson/os/seastore/transaction_manager.cc +++ b/src/crimson/os/seastore/transaction_manager.cc @@ -239,7 +239,7 @@ TransactionManager::submit_transaction_direct( tref.get_handle().enter(write_pipeline.prepare) ).then_interruptible([this, FNAME, &tref]() mutable -> submit_transaction_iertr::future<> { - auto record = cache->try_construct_record(tref); + auto record = cache->prepare_record(tref); tref.get_handle().maybe_release_collection_lock(); diff --git a/src/test/crimson/seastore/test_btree_lba_manager.cc b/src/test/crimson/seastore/test_btree_lba_manager.cc index 175ca86eaff..596e8362f6b 100644 --- a/src/test/crimson/seastore/test_btree_lba_manager.cc +++ b/src/test/crimson/seastore/test_btree_lba_manager.cc @@ -58,7 +58,7 @@ struct btree_lba_manager_test : seastar::future<> submit_transaction(TransactionRef t) { - auto record = cache.try_construct_record(*t); + auto record = cache.prepare_record(*t); return journal.submit_record(std::move(record), t->get_handle()).safe_then( [this, t=std::move(t)](auto p) mutable { auto [addr, seq] = p; diff --git a/src/test/crimson/seastore/test_seastore_cache.cc b/src/test/crimson/seastore/test_seastore_cache.cc index 09cf6dc0562..42d285671e9 100644 --- a/src/test/crimson/seastore/test_seastore_cache.cc +++ b/src/test/crimson/seastore/test_seastore_cache.cc @@ -31,7 +31,7 @@ struct cache_test_t : public seastar_test_suite_t { seastar::future submit_transaction( TransactionRef t) { - auto record = cache.try_construct_record(*t); + auto record = cache.prepare_record(*t); bufferlist bl; for (auto &&block : record.extents) { -- 2.39.5