From: Samuel Just <sjust@redhat.com>
Date: Sat, 8 May 2021 01:57:46 +0000 (-0700)
Subject: crimson/os/seastore/seastore.cc: swap stop and umount
X-Git-Tag: v17.1.0~2000^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d40022295e10af15c781f80355acfe935c1ebe87;p=ceph.git

crimson/os/seastore/seastore.cc: swap stop and umount

start/stop seem to be intended for things like thread pools, etc that
seastore doesn't have.  Umount maps more cleanly here.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index 4afa5057b875..05d72771c29d 100644
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -39,13 +39,7 @@ struct SeastoreCollection final : public FuturizedCollection {
 
 seastar::future<> SeaStore::stop()
 {
-  return transaction_manager->close(
-  ).handle_error(
-    crimson::ct_error::assert_all{
-      "Invalid error in SeaStore::stop"
-    }
-  );
-
+  return seastar::now();
 }
 
 seastar::future<> SeaStore::mount()
@@ -62,7 +56,12 @@ seastar::future<> SeaStore::mount()
 
 seastar::future<> SeaStore::umount()
 {
-  return seastar::now();
+  return transaction_manager->close(
+  ).handle_error(
+    crimson::ct_error::assert_all{
+      "Invalid error in SeaStore::umount"
+    }
+  );
 }
 
 seastar::future<> SeaStore::mkfs(uuid_d new_osd_fsid)
@@ -91,7 +90,7 @@ seastar::future<> SeaStore::mkfs(uuid_d new_osd_fsid)
 	});
       });
   }).safe_then([this] {
-    return stop();
+    return umount();
   }).handle_error(
     crimson::ct_error::assert_all{
       "Invalid error in SeaStore::mkfs"
diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h
index 11dcb1cbb282..ce99b76796c2 100644
--- a/src/test/crimson/seastore/transaction_manager_test_state.h
+++ b/src/test/crimson/seastore/transaction_manager_test_state.h
@@ -202,7 +202,7 @@ protected:
   }
 
   virtual seastar::future<> _teardown() {
-    return seastore->stop();
+    return seastore->umount();
   }
 
   virtual seastar::future<> _mount() {