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 4afa5057b875a7b44a7dd4e2960c53e9865e842e..05d72771c29d1d418c6c6248e013d63009ec7e46 100644 (file)
--- 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 11dcb1cbb2829f42eeb62832348baf3815052754..ce99b76796c2df63bced45febf94dc87f6adf896 100644 (file)
--- 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() {