From 5bc6da50388c91d47ded29359b88239b0c940652 Mon Sep 17 00:00:00 2001 From: Chunmei Liu Date: Thu, 21 Aug 2025 01:10:52 +0000 Subject: [PATCH] test/crimson/seastore: using StoreShardRef instead of Shard* Signed-off-by: Chunmei Liu --- src/test/crimson/seastore/test_btree_lba_manager.cc | 8 ++++---- src/test/crimson/seastore/test_cbjournal.cc | 2 +- src/test/crimson/seastore/test_seastore_cache.cc | 4 ++-- src/test/crimson/seastore/test_seastore_journal.cc | 4 ++-- .../crimson/seastore/transaction_manager_test_state.h | 7 ++++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/test/crimson/seastore/test_btree_lba_manager.cc b/src/test/crimson/seastore/test_btree_lba_manager.cc index d263b72f489..6dce5fa5bff 100644 --- a/src/test/crimson/seastore/test_btree_lba_manager.cc +++ b/src/test/crimson/seastore/test_btree_lba_manager.cc @@ -138,14 +138,14 @@ struct btree_test_base : segment_manager::get_ephemeral_device_config(0, 1, 0)); }).safe_then([this] { sms.reset(new SegmentManagerGroup()); - journal = journal::make_segmented(*this, *this); + journal = journal::make_segmented(0, *this, *this); rewrite_gen_t hot_tier_generations = crimson::common::get_conf( "seastore_hot_tier_generations"); rewrite_gen_t cold_tier_generations = crimson::common::get_conf( "seastore_cold_tier_generations"); epm.reset(new ExtentPlacementManager( - hot_tier_generations, cold_tier_generations)); - cache.reset(new Cache(*epm)); + hot_tier_generations, cold_tier_generations, 0)); + cache.reset(new Cache(*epm, 0)); block_size = segment_manager->get_block_size(); next = segment_id_t{segment_manager->get_device_id(), 0}; @@ -423,7 +423,7 @@ struct btree_lba_manager_test : btree_test_base { void complete_commit(Transaction &t) final {} LBAManager::mkfs_ret test_structure_setup(Transaction &t) final { - lba_manager.reset(new BtreeLBAManager(*cache)); + lba_manager.reset(new BtreeLBAManager(*cache, 0)); return lba_manager->mkfs(t); } diff --git a/src/test/crimson/seastore/test_cbjournal.cc b/src/test/crimson/seastore/test_cbjournal.cc index 22b26b53aba..84a84d7ea9c 100644 --- a/src/test/crimson/seastore/test_cbjournal.cc +++ b/src/test/crimson/seastore/test_cbjournal.cc @@ -331,7 +331,7 @@ struct cbjournal_test_t : public seastar_test_suite_t, JournalTrimmer seastar::future<> set_up_fut() final { device = random_block_device::create_test_ephemeral( random_block_device::DEFAULT_TEST_CBJOURNAL_SIZE, 0); - cbj.reset(new CircularBoundedJournal(*this, device.get(), std::string())); + cbj.reset(new CircularBoundedJournal(0, *this, device.get(), std::string())); block_size = device->get_block_size(); cbj->set_write_pipeline(&pipeline); return mkfs( diff --git a/src/test/crimson/seastore/test_seastore_cache.cc b/src/test/crimson/seastore/test_seastore_cache.cc index e0f101d13bb..52293c6dd12 100644 --- a/src/test/crimson/seastore/test_seastore_cache.cc +++ b/src/test/crimson/seastore/test_seastore_cache.cc @@ -115,8 +115,8 @@ struct cache_test_t : public seastar_test_suite_t { rewrite_gen_t cold_tier_generations = crimson::common::get_conf( "seastore_cold_tier_generations"); epm.reset(new ExtentPlacementManager( - hot_tier_generations, cold_tier_generations)); - cache.reset(new Cache(*epm)); + hot_tier_generations, cold_tier_generations, 0)); + cache.reset(new Cache(*epm, 0)); current = paddr_t::make_seg_paddr(segment_id_t(segment_manager->get_device_id(), 0), 0); epm->test_init_no_background(segment_manager.get()); return seastar::do_with( diff --git a/src/test/crimson/seastore/test_seastore_journal.cc b/src/test/crimson/seastore/test_seastore_journal.cc index 29387408096..807b64ddd04 100644 --- a/src/test/crimson/seastore/test_seastore_journal.cc +++ b/src/test/crimson/seastore/test_seastore_journal.cc @@ -157,7 +157,7 @@ struct journal_test_t : seastar_test_suite_t, SegmentProvider, JournalTrimmer { block_size = segment_manager->get_block_size(); sms.reset(new SegmentManagerGroup()); next = segment_id_t(segment_manager->get_device_id(), 0); - journal = journal::make_segmented(*this, *this); + journal = journal::make_segmented(0, *this, *this); journal->set_write_pipeline(&pipeline); sms->add_segment_manager(segment_manager.get()); return journal->open_for_mkfs(); @@ -182,7 +182,7 @@ struct journal_test_t : seastar_test_suite_t, SegmentProvider, JournalTrimmer { auto replay(T &&f) { return journal->close( ).safe_then([this, f=std::move(f)]() mutable { - journal = journal::make_segmented(*this, *this); + journal = journal::make_segmented(0, *this, *this); journal->set_write_pipeline(&pipeline); return journal->replay(std::forward(std::move(f))); }).safe_then([this] { diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index 25d1c504862..2f6312bacaa 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -294,7 +294,7 @@ protected: } #endif shard_stats = {}; - tm = make_transaction_manager(p_dev, sec_devices, shard_stats, true); + tm = make_transaction_manager(p_dev, sec_devices, shard_stats, 0, true); epm = tm->get_epm(); lba_manager = tm->get_lba_manager(); cache = tm->get_cache(); @@ -432,7 +432,7 @@ class SeaStoreTestState : public EphemeralTestState { protected: std::unique_ptr seastore; - FuturizedStore::Shard *sharded_seastore; + FuturizedStore::StoreShardRef sharded_seastore; SeaStoreTestState() : EphemeralTestState(1, 0) {} @@ -452,12 +452,13 @@ protected: return fut.then([this] { return seastore->test_start(devices->get_primary_device_ref()); }).then([this] { - sharded_seastore = &(seastore->get_sharded_store()); + sharded_seastore = seastore->get_sharded_store(); }); } virtual seastar::future<> _destroy() final { devices->set_primary_device_ref(seastore->get_primary_device_ref()); + sharded_seastore.reset(); return seastore->stop().then([this] { seastore.reset(); }); -- 2.47.3