From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Tue, 22 Dec 2020 05:43:51 +0000 (+0800)
Subject: test/crimson: implement restart() for seastore replay tests
X-Git-Tag: v16.1.0~63^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed7d62c6a8d51f581cfa1b2acdf1be3ec76be2b9;p=ceph.git

test/crimson: implement restart() for seastore replay tests

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

diff --git a/src/test/crimson/seastore/test_extmap_manager.cc b/src/test/crimson/seastore/test_extmap_manager.cc
index ca299e28a2114..8b25880119d8e 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::EphemeralSegmentManager*>(&*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 f561cacff18bb..9906f938a63ba 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::EphemeralSegmentManager*>(&*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 d13d4c65ee3a5..bf24409232299 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::EphemeralSegmentManager*>(&*segment_manager)->remount();
+    init();
+    tm->mount().unsafe_get();
+  }
+
   seastar::future<> tm_setup() {
     return segment_manager->init(
     ).safe_then([this] {