From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Tue, 26 Oct 2021 06:19:33 +0000 (+0800)
Subject: crimson/os/seastore/journal: proper close journal when test finishes
X-Git-Tag: v17.1.0~582^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f304ad6da42a1662a94c919fe5a705f846f0c6a;p=ceph.git

crimson/os/seastore/journal: proper close journal when test finishes

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

diff --git a/src/test/crimson/seastore/test_seastore_journal.cc b/src/test/crimson/seastore/test_seastore_journal.cc
index 53679f174a1..f264bf429c0 100644
--- a/src/test/crimson/seastore/test_seastore_journal.cc
+++ b/src/test/crimson/seastore/test_seastore_journal.cc
@@ -114,6 +114,15 @@ struct journal_test_t : seastar_test_suite_t, SegmentProvider {
       }));
   }
 
+  seastar::future<> tear_down_fut() final {
+    return journal->close(
+    ).handle_error(
+      crimson::ct_error::all_same_way([](auto e) {
+        ASSERT_FALSE("Unable to close");
+      })
+    );
+  }
+
   template <typename T>
   auto replay(T &&f) {
     return journal->close(
@@ -209,10 +218,6 @@ struct journal_test_t : seastar_test_suite_t, SegmentProvider {
     return addr;
   }
 
-  seastar::future<> tear_down_fut() final {
-    return seastar::now();
-  }
-
   extent_t generate_extent(size_t blocks) {
     std::uniform_int_distribution<char> distribution(
       std::numeric_limits<char>::min(),