From: xuxuehan <xuxuehan@qianxin.com>
Date: Fri, 26 May 2023 07:55:44 +0000 (+0800)
Subject: crimson/os/seastore/onode_manager: erase onodes from the OnodeTree at the moment... 
X-Git-Tag: v18.2.1~104^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6990c4b2febf1c4ba51dc167dee8e764158d8994;p=ceph-ci.git

crimson/os/seastore/onode_manager: erase onodes from the OnodeTree at the moment of erase_onode

Signed-off-by: xuxuehan <xuxuehan@qianxin.com>
(cherry picked from commit e5ee75ee85a7c6f5de6823986eeb30fe44349c47)
---

diff --git a/src/crimson/os/seastore/onode.h b/src/crimson/os/seastore/onode.h
index 952dd9cca34..069daa3df5b 100644
--- a/src/crimson/os/seastore/onode.h
+++ b/src/crimson/os/seastore/onode.h
@@ -62,6 +62,7 @@ public:
       default_metadata_range(dmr)
   {}
 
+  virtual bool is_alive() const = 0;
   virtual const onode_layout_t &get_layout() const = 0;
   virtual onode_layout_t &get_mutable_layout(Transaction &t) = 0;
   virtual ~Onode() = default;
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc
index 8d75f9fa837..ba78cbf0b0b 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.cc
@@ -93,16 +93,19 @@ FLTreeOnodeManager::write_dirty_ret FLTreeOnodeManager::write_dirty(
 {
   return trans_intr::do_for_each(
     onodes,
-    [this, &trans](auto &onode) -> eagain_ifuture<> {
+    [&trans](auto &onode) -> eagain_ifuture<> {
+      if (!onode) {
+	return eagain_iertr::make_ready_future<>();
+      }
       auto &flonode = static_cast<FLTreeOnode&>(*onode);
+      if (!flonode.is_alive()) {
+	return eagain_iertr::make_ready_future<>();
+      }
       switch (flonode.status) {
       case FLTreeOnode::status_t::MUTATED: {
         flonode.populate_recorder(trans);
         return eagain_iertr::make_ready_future<>();
       }
-      case FLTreeOnode::status_t::DELETED: {
-        return tree.erase(trans, flonode);
-      }
       case FLTreeOnode::status_t::STABLE: {
         return eagain_iertr::make_ready_future<>();
       }
@@ -118,7 +121,7 @@ FLTreeOnodeManager::erase_onode_ret FLTreeOnodeManager::erase_onode(
 {
   auto &flonode = static_cast<FLTreeOnode&>(*onode);
   flonode.mark_delete();
-  return erase_onode_iertr::now();
+  return tree.erase(trans, flonode);
 }
 
 FLTreeOnodeManager::list_onodes_ret FLTreeOnodeManager::list_onodes(
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h
index 0367b823f36..09998fbfaea 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h
@@ -70,6 +70,9 @@ struct FLTreeOnode final : Onode, Value {
     }
   };
 
+  bool is_alive() const {
+    return status != status_t::DELETED;
+  }
   const onode_layout_t &get_layout() const final {
     assert(status != status_t::DELETED);
     return *read_payload<onode_layout_t>();
diff --git a/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc b/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
index 79be50dc0db..1f661cdca59 100644
--- a/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
+++ b/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
@@ -120,7 +120,11 @@ struct fltree_onode_manager_test_t
       }).unsafe_get0();
       std::invoke(f, t, *onode, p_kv->value);
       with_trans_intr(t, [&](auto &t) {
-        return manager->write_dirty(t, {onode});
+	if (onode->is_alive()) {
+	  return manager->write_dirty(t, {onode});
+	} else {
+	  return OnodeManager::write_dirty_iertr::now();
+	}
       }).unsafe_get0();
     });
   }
diff --git a/src/test/crimson/seastore/test_object_data_handler.cc b/src/test/crimson/seastore/test_object_data_handler.cc
index 43f93b07fb7..6510cb5d93f 100644
--- a/src/test/crimson/seastore/test_object_data_handler.cc
+++ b/src/test/crimson/seastore/test_object_data_handler.cc
@@ -34,6 +34,9 @@ public:
     dirty = true;
     return layout;
   }
+  bool is_alive() const {
+    return true;
+  }
   bool is_dirty() const { return dirty; }
   laddr_t get_hint() const final {return L_ADDR_MIN; }
   ~TestOnode() final = default;