crimson/os/seastore/cache: drop extents on close()

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

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index a977db30db78c669f0ada486b03d433939712864..e5ab31c204cc384fb757a2b2fbaff88802dabbf5 100644 (file)
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -19,13 +19,6 @@ namespace crimson::os::seastore {
 
 Cache::~Cache()
 {
-  retire_extent(root);
-  root.reset();
-  for (auto i = dirty.begin(); i != dirty.end(); ) {
-    auto ptr = &*i;
-    dirty.erase(i++);
-    intrusive_ptr_release(ptr);
-  }
   for (auto &i: extents) {
     logger().error("~Cache: extent {} still alive", i);
   }
@@ -188,6 +181,13 @@ Cache::mkfs_ertr::future<> Cache::mkfs(Transaction &t)
 
 Cache::close_ertr::future<> Cache::close()
 {
+  retire_extent(root);
+  root.reset();
+  for (auto i = dirty.begin(); i != dirty.end(); ) {
+    auto ptr = &*i;
+    dirty.erase(i++);
+    intrusive_ptr_release(ptr);
+  }
   return close_ertr::now();
 }
 

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index 7fa91a307b0bd9d2f221790d7637ed91f2a59429..e3495961b1a38735f0be08e56046d1368a84e56e 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -338,7 +338,7 @@ public:
   /**
    * close
    *
-   * TODO: currently a noop -- probably should be used to flush dirty blocks
+   * TODO: should flush dirty blocks
    */
   using close_ertr = crimson::errorator<
     crimson::ct_error::input_output_error>;