From ed7d62c6a8d51f581cfa1b2acdf1be3ec76be2b9 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Tue, 22 Dec 2020 13:43:51 +0800 Subject: [PATCH] test/crimson: implement restart() for seastore replay tests Signed-off-by: Yingxin Cheng --- src/test/crimson/seastore/test_extmap_manager.cc | 6 +----- src/test/crimson/seastore/test_transaction_manager.cc | 6 +----- .../crimson/seastore/transaction_manager_test_state.h | 8 ++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/crimson/seastore/test_extmap_manager.cc b/src/test/crimson/seastore/test_extmap_manager.cc index ca299e28a21..8b25880119d 100644 --- a/src/test/crimson/seastore/test_extmap_manager.cc +++ b/src/test/crimson/seastore/test_extmap_manager.cc @@ -109,11 +109,7 @@ struct extentmap_manager_test_t : void replay() { logger().debug("{}: begin", __func__); - tm->close().unsafe_get(); - destroy(); - static_cast(&*segment_manager)->remount(); - init(); - tm->mount().unsafe_get(); + restart(); extmap_manager = extentmap_manager::create_extentmap_manager(*tm); logger().debug("{}: end", __func__); } diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc index f561cacff18..9906f938a63 100644 --- a/src/test/crimson/seastore/test_transaction_manager.cc +++ b/src/test/crimson/seastore/test_transaction_manager.cc @@ -176,11 +176,7 @@ struct transaction_manager_test_t : void replay() { logger().debug("{}: begin", __func__); EXPECT_TRUE(check_usage()); - tm->close().unsafe_get(); - destroy(); - static_cast(&*segment_manager)->remount(); - init(); - tm->mount().unsafe_get(); + restart(); logger().debug("{}: end", __func__); } diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index d13d4c65ee3..bf244092322 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -52,6 +52,14 @@ protected: segment_cleaner.reset(); } + void restart() { + tm->close().unsafe_get(); + destroy(); + static_cast(&*segment_manager)->remount(); + init(); + tm->mount().unsafe_get(); + } + seastar::future<> tm_setup() { return segment_manager->init( ).safe_then([this] { -- 2.47.3