Merge pull request ceph#61347 from xxhdx1985126/wip-seastore-tree-pointer-abstract

crimson/os/seastore: refactor fixed-kv-btree

Reviewed-by: Yingxin Cheng <[email protected]>

Author: cyx1231st

src/crimson/os/seastore/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(crimson_seastore_srcs
   cached_extent.cc
   lba_mapping.cc
+  logical_child_node.cc
   seastore_types.cc
   segment_manager.cc
   segment_manager/ephemeral.cc
@@ -20,7 +21,6 @@ set(crimson_seastore_srcs
   omap_manager.cc
   omap_manager/btree/btree_omap_manager.cc
   omap_manager/btree/omap_btree_node_impl.cc
-  btree/fixed_kv_node.cc
   onode.cc
   onode_manager/staged-fltree/node.cc
   onode_manager/staged-fltree/node_extent_manager.cc

src/crimson/os/seastore/backref/backref_tree_node.h

@@ -5,6 +5,10 @@
 
 #include "crimson/os/seastore/btree/fixed_kv_node.h"
 
+namespace crimson::os::seastore {
+class LogicalChildNode;
+}
+
 namespace crimson::os::seastore::backref {
 
 using backref_node_meta_t = fixed_kv_node_meta_t<paddr_t>;
@@ -86,6 +90,7 @@ class BackrefInternalNode
     check_capacity(BACKREF_NODE_SIZE),
     "INTERNAL_NODE_CAPACITY doesn't fit in BACKREF_NODE_SIZE");
 public:
+  using key_type = paddr_t;
   template <typename... T>
   BackrefInternalNode(T&&... t) :
     FixedKVInternalNode(std::forward<T>(t)...) {}
@@ -104,12 +109,13 @@ class BackrefLeafNode
       paddr_t, paddr_le_t,
       backref_map_val_t, backref_map_val_le_t,
       BACKREF_NODE_SIZE,
-      BackrefLeafNode,
-      false> {
+      BackrefInternalNode,
+      BackrefLeafNode> {
   static_assert(
     check_capacity(BACKREF_NODE_SIZE),
     "LEAF_NODE_CAPACITY doesn't fit in BACKREF_NODE_SIZE");
 public:
+  using key_type = paddr_t;
   template <typename... T>
   BackrefLeafNode(T&&... t) :
     FixedKVLeafNode(std::forward<T>(t)...) {}
@@ -123,8 +129,7 @@ class BackrefLeafNode
   const_iterator insert(
     const_iterator iter,
     paddr_t key,
-    backref_map_val_t val,
-    LogicalCachedExtent*) final {
+    backref_map_val_t val) final {
     journal_insert(
       iter,
       key,
@@ -135,8 +140,7 @@ class BackrefLeafNode
 
   void update(
     const_iterator iter,
-    backref_map_val_t val,
-    LogicalCachedExtent*) final {
+    backref_map_val_t val) final {
     return journal_update(
       iter,
       val,
@@ -149,6 +153,46 @@ class BackrefLeafNode
       maybe_get_delta_buffer());
   }
 
+  void do_on_rewrite(Transaction &t, CachedExtent &extent) final {}
+  void do_on_replace_prior() final {}
+  void do_prepare_commit() final {}
+
+
+  void on_split(
+    Transaction &t,
+    BackrefLeafNode &left,
+    BackrefLeafNode &right) final {}
+
+  void on_merge(
+    Transaction &t,
+    BackrefLeafNode &left,
+    BackrefLeafNode &right) final {}
+
+  void on_balance(
+    Transaction &t,
+    BackrefLeafNode &left,
+    BackrefLeafNode &right,
+    bool prefer_left,
+    BackrefLeafNode &replacement_left,
+    BackrefLeafNode &replacement_right) final {}
+
+  void adjust_copy_src_dest_on_split(
+    Transaction &t,
+    BackrefLeafNode &left,
+    BackrefLeafNode &right) final {}
+
+  void adjust_copy_src_dest_on_merge(
+    Transaction &t,
+    BackrefLeafNode &left,
+    BackrefLeafNode &right) final {}
+
+  void adjust_copy_src_dest_on_balance(
+    Transaction &t,
+    BackrefLeafNode &left,
+    BackrefLeafNode &right,
+    bool prefer_left,
+    BackrefLeafNode &replacement_left,
+    BackrefLeafNode &replacement_right) final {}
   // backref leaf nodes don't have to resolve relative addresses
   void resolve_relative_addrs(paddr_t base) final {}
 

src/crimson/os/seastore/backref/btree_backref_manager.cc

@@ -47,24 +47,21 @@ const get_phy_tree_root_node_ret get_phy_tree_root_node<
   }
 }
 
-template <typename ROOT>
-void link_phy_tree_root_node(RootBlockRef &root_block, ROOT* backref_root) {
-  root_block->backref_root_node = backref_root;
-  ceph_assert(backref_root != nullptr);
-  backref_root->root_block = root_block;
-}
-
-template void link_phy_tree_root_node(
-  RootBlockRef &root_block, backref::BackrefInternalNode* backref_root);
-template void link_phy_tree_root_node(
-  RootBlockRef &root_block, backref::BackrefLeafNode* backref_root);
-template void link_phy_tree_root_node(
-  RootBlockRef &root_block, backref::BackrefNode* backref_root);
+template <typename RootT>
+class TreeRootLinker<RootBlock, RootT> {
+public:
+  static void link_root(RootBlockRef &root_block, RootT* backref_root) {
+    root_block->backref_root_node = backref_root;
+    ceph_assert(backref_root != nullptr);
+    backref_root->parent_of_root = root_block;
+  }
+  static void unlink_root(RootBlockRef &root_block) {
+    root_block->backref_root_node = nullptr;
+  }
+};
 
-template <>
-void unlink_phy_tree_root_node<paddr_t>(RootBlockRef &root_block) {
-  root_block->backref_root_node = nullptr;
-}
+template class TreeRootLinker<RootBlock, backref::BackrefInternalNode>;
+template class TreeRootLinker<RootBlock, backref::BackrefLeafNode>;
 
 }
 
@@ -231,8 +228,7 @@ BtreeBackrefManager::new_mapping(
 	    c,
 	    *state.insert_iter,
 	    state.last_end,
-	    val,
-	    nullptr
+	    val
 	  ).si_then([&state, c, addr, len, key](auto &&p) {
 	    LOG_PREFIX(BtreeBackrefManager::new_mapping);
 	    auto [iter, inserted] = std::move(p);

src/crimson/os/seastore/backref/btree_backref_manager.h

@@ -15,7 +15,7 @@ class BtreeBackrefMapping : public BackrefMapping {
     : BackrefMapping(ctx) {}
   BtreeBackrefMapping(
     op_context_t<paddr_t> ctx,
-    CachedExtentRef parent,
+    BackrefLeafNodeRef parent,
     uint16_t pos,
     backref_map_val_t &val,
     backref_node_meta_t &&meta)
@@ -33,7 +33,7 @@ constexpr size_t BACKREF_BLOCK_SIZE = 4096;
 
 using BackrefBtree = FixedKVBtree<
   paddr_t, backref_map_val_t, BackrefInternalNode,
-  BackrefLeafNode, BtreeBackrefMapping, BACKREF_BLOCK_SIZE, false>;
+  BackrefLeafNode, BtreeBackrefMapping, BACKREF_BLOCK_SIZE>;
 
 class BtreeBackrefManager : public BackrefManager {
 public: