From dd78132fa110e49b7b693b8d642a213267bac3fd Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 29 Jul 2022 12:56:31 +0800 Subject: [PATCH] test/crimson/seastore/transaction_manager_test_state: improve logs Signed-off-by: Yingxin Cheng --- .../seastore/onode_tree/test_staged_fltree.cc | 6 ------ .../crimson/seastore/test_collection_manager.cc | 2 -- src/test/crimson/seastore/test_omap_manager.cc | 2 -- .../seastore/test_transaction_manager.cc | 2 -- .../seastore/transaction_manager_test_state.h | 17 +++++++++++++++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc index b00db5e8a6d..a1c743bca2b 100644 --- a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc +++ b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc @@ -1606,10 +1606,8 @@ TEST_F(d_seastore_tm_test_t, 6_random_tree_insert_erase) INTR(tree->get_stats, *t).unsafe_get(); } if constexpr (TEST_SEASTORE) { - logger().info("seastore replay insert begin"); restart(); tree->reload(NodeExtentManager::create_seastore(*tm)); - logger().info("seastore replay insert end"); } { // Note: create_weak_transaction() can also work, but too slow. @@ -1630,10 +1628,8 @@ TEST_F(d_seastore_tm_test_t, 6_random_tree_insert_erase) INTR(tree->get_stats, *t).unsafe_get(); } if constexpr (TEST_SEASTORE) { - logger().info("seastore replay erase-1 begin"); restart(); tree->reload(NodeExtentManager::create_seastore(*tm)); - logger().info("seastore replay erase-1 end"); } { auto t = create_read_transaction(); @@ -1653,10 +1649,8 @@ TEST_F(d_seastore_tm_test_t, 6_random_tree_insert_erase) INTR(tree->get_stats, *t).unsafe_get(); } if constexpr (TEST_SEASTORE) { - logger().info("seastore replay erase-2 begin"); restart(); tree->reload(NodeExtentManager::create_seastore(*tm)); - logger().info("seastore replay erase-2 end"); } { auto t = create_read_transaction(); diff --git a/src/test/crimson/seastore/test_collection_manager.cc b/src/test/crimson/seastore/test_collection_manager.cc index e15602c218d..00c5a6b87cf 100644 --- a/src/test/crimson/seastore/test_collection_manager.cc +++ b/src/test/crimson/seastore/test_collection_manager.cc @@ -64,10 +64,8 @@ struct collection_manager_test_t : test_collection_t test_coll_mappings; void replay() { - logger().debug("{}: begin", __func__); restart(); collection_manager = collection_manager::create_coll_manager(*tm); - logger().debug("{}: end", __func__); } auto get_root() { diff --git a/src/test/crimson/seastore/test_omap_manager.cc b/src/test/crimson/seastore/test_omap_manager.cc index 2b1e2281820..708f32415ee 100644 --- a/src/test/crimson/seastore/test_omap_manager.cc +++ b/src/test/crimson/seastore/test_omap_manager.cc @@ -208,10 +208,8 @@ struct omap_manager_test_t : } void replay() { - logger().debug("{}: begin", __func__); restart(); omap_manager = omap_manager::create_omap_manager(*tm); - logger().debug("{}: end", __func__); } auto initialize() { diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc index 9b1c77f06b0..d496450974a 100644 --- a/src/test/crimson/seastore/test_transaction_manager.cc +++ b/src/test/crimson/seastore/test_transaction_manager.cc @@ -435,10 +435,8 @@ struct transaction_manager_test_t : } void replay() { - logger().info("{}: begin", __func__); EXPECT_TRUE(check_usage()); restart(); - logger().info("{}: end", __func__); } void check() { diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index b2c6091672f..f288a074a0d 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -8,6 +8,7 @@ #include "crimson/os/seastore/async_cleaner.h" #include "crimson/os/seastore/cache.h" +#include "crimson/os/seastore/logging.h" #include "crimson/os/seastore/transaction_manager.h" #include "crimson/os/seastore/segment_manager/ephemeral.h" #include "crimson/os/seastore/seastore.h" @@ -52,6 +53,8 @@ protected: virtual FuturizedStore::mount_ertr::future<> _mount() = 0; void restart() { + LOG_PREFIX(EphemeralTestState::restart); + SUBINFO(test, "begin ..."); _teardown().get0(); destroy(); segment_manager->remount(); @@ -60,10 +63,13 @@ protected: } init(); _mount().handle_error(crimson::ct_error::assert_all{}).get0(); + SUBINFO(test, "finish"); } seastar::future<> tm_setup( tm_make_config_t config = tm_make_config_t::get_test_segmented_journal()) { + LOG_PREFIX(EphemeralTestState::tm_setup); + SUBINFO(test, "begin with {} devices ...", get_num_devices()); tm_config = config; segment_manager = segment_manager::create_test_ephemeral(); for (auto &sec_sm : secondary_segment_managers) { @@ -113,16 +119,23 @@ protected: } init(); return _mount(); - }).handle_error(crimson::ct_error::assert_all{}); + }).handle_error( + crimson::ct_error::assert_all{} + ).then([FNAME] { + SUBINFO(test, "finish"); + }); } seastar::future<> tm_teardown() { - return _teardown().then([this] { + LOG_PREFIX(EphemeralTestState::tm_teardown); + SUBINFO(test, "begin"); + return _teardown().then([this, FNAME] { segment_manager.reset(); for (auto &sec_sm : secondary_segment_managers) { sec_sm.reset(); } rb_device.reset(); + SUBINFO(test, "finish"); }); } }; -- 2.39.5