test/crimson/seastore/transaction_manager_test_state: improve logs

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

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 b00db5e8a6df33cf75a848d04d9028af078a5cf2..a1c743bca2b7cbd6b629e0ab63f16fde1d174af9 100644 (file)
--- 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 e15602c218dc9f8cba9c50cd0c0741e031b6b6c3..00c5a6b87cfa25297782a5f3d9e346b122df873b 100644 (file)
--- 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 2b1e22818204d4896af4ee5f4b602f7a01965253..708f32415ee9ca25c96f7248d90f6c534ab4acaa 100644 (file)
--- 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 9b1c77f06b04deb41fdedf8da7ed25511c29d1b2..d496450974a27b6bb87cf688af86129984232813 100644 (file)
--- 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 b2c6091672f86b4ce4b12a27bbaf91291fb6c230..f288a074a0d0fc95c793e7cec845e8e38379055c 100644 (file)
--- 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");
     });
   }
 };