Merge pull request ceph#61936 from xxhdx1985126/wip-seastore-omap-tree-pointer

crimson/os/seastore/omap_manager: apply linked tree nodes to omap trees

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

Author: cyx1231st

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

@@ -91,6 +91,7 @@ class BackrefInternalNode
     "INTERNAL_NODE_CAPACITY doesn't fit in BACKREF_NODE_SIZE");
 public:
   using key_type = paddr_t;
+  static constexpr uint32_t CHILD_VEC_UNIT = 0;
   template <typename... T>
   BackrefInternalNode(T&&... t) :
     FixedKVInternalNode(std::forward<T>(t)...) {}

src/crimson/os/seastore/btree/fixed_kv_btree.h

@@ -1503,6 +1503,7 @@ class FixedKVBtree {
         return on_found(child->template cast<internal_node_t>());
       });
     }
+    c.cache.account_absent_access(c.trans.get_src());
 
     auto child_pos = v.get_child_pos();
     auto next_iter = node_iter + 1;
@@ -1574,6 +1575,7 @@ class FixedKVBtree {
         return on_found(child->template cast<leaf_node_t>());
       });
     }
+    c.cache.account_absent_access(c.trans.get_src());
 
     auto child_pos = v.get_child_pos();
     auto next_iter = node_iter + 1;
@@ -2133,6 +2135,7 @@ class FixedKVBtree {
         return do_merge(child->template cast<NodeType>());
       });
     }
+    c.cache.account_absent_access(c.trans.get_src());
 
     auto child_pos = v.get_child_pos();
     return get_node<NodeType>(

src/crimson/os/seastore/btree/fixed_kv_node.h

@@ -49,6 +49,10 @@ struct FixedKVNode : CachedExtent {
   virtual ~FixedKVNode() = default;
   virtual void do_on_rewrite(Transaction &t, CachedExtent &extent) = 0;
 
+  bool is_in_range(const node_key_t key) const {
+    return get_node_meta().is_in_range(key);
+  }
+
   void on_rewrite(Transaction &t, CachedExtent &extent, extent_len_t off) final {
     assert(get_type() == extent.get_type());
     assert(off == 0);
@@ -139,7 +143,7 @@ struct FixedKVInternalNode
     node_size,
     node_type_t>;
   using parent_node_t = ParentNode<node_type_t, NODE_KEY>;
-  using base_child_node_t = BaseChildNode<node_type_t, NODE_KEY>;
+  using base_child_t = BaseChildNode<node_type_t, NODE_KEY>;
   using child_node_t = ChildNode<node_type_t, node_type_t, NODE_KEY>;
   using root_node_t = RootChildNode<RootBlock, node_type_t>;
 
@@ -236,7 +240,7 @@ struct FixedKVInternalNode
   void update(
     internal_const_iterator_t iter,
     paddr_t addr,
-    base_child_node_t* nextent) {
+    base_child_t* nextent) {
     LOG_PREFIX(FixedKVInternalNode::update);
     SUBTRACE(seastore_fixedkv_tree, "trans.{}, pos {}, {}",
       this->pending_for_transaction,
@@ -253,7 +257,7 @@ struct FixedKVInternalNode
     internal_const_iterator_t iter,
     NODE_KEY pivot,
     paddr_t addr,
-    base_child_node_t* nextent) {
+    base_child_t* nextent) {
     LOG_PREFIX(FixedKVInternalNode::insert);
     SUBTRACE(seastore_fixedkv_tree, "trans.{}, pos {}, key {}, {}",
       this->pending_for_transaction,
@@ -284,7 +288,7 @@ struct FixedKVInternalNode
     internal_const_iterator_t iter,
     NODE_KEY pivot,
     paddr_t addr,
-    base_child_node_t* nextent) {
+    base_child_t* nextent) {
     LOG_PREFIX(FixedKVInternalNode::replace);
     SUBTRACE(seastore_fixedkv_tree, "trans.{}, pos {}, old key {}, key {}, {}",
       this->pending_for_transaction,
@@ -515,6 +519,7 @@ struct FixedKVLeafNode
   using base_t = FixedKVNode<NODE_KEY>;
   using child_node_t = ChildNode<internal_node_type_t, node_type_t, NODE_KEY>;
   using root_node_t = RootChildNode<RootBlock, node_type_t>;
+  using base_child_t = BaseChildNode<node_type_t, NODE_KEY>;
   explicit FixedKVLeafNode(ceph::bufferptr &&ptr)
     : FixedKVNode<NODE_KEY>(std::move(ptr)) {
     this->set_layout_buf(this->get_bptr().c_str());

src/crimson/os/seastore/cache.cc

@@ -1340,6 +1340,14 @@ record_t Cache::prepare_record(
     delta_stat.increment(delta_length);
   }
 
+  t.for_each_finalized_fresh_block([](auto &e) {
+    // fresh blocks' `prepare_commit` must be invoked before
+    // retiering extents, this is because logical linked tree
+    // nodes needs to access their prior instances in this
+    // phase if they are rewritten.
+    e->prepare_commit();
+  });
+
   // Transaction is now a go, set up in-memory cache state
   // invalidate now invalid blocks
   io_stat_t retire_stat;
@@ -1403,7 +1411,6 @@ record_t Cache::prepare_record(
 
     bufferlist bl;
     i->prepare_write();
-    i->prepare_commit();
     bl.append(i->get_bptr());
     if (is_root_type(i->get_type())) {
       ceph_assert(0 == "ROOT never gets written as a fresh block");
@@ -1457,7 +1464,6 @@ record_t Cache::prepare_record(
     assert(!i->is_inline());
     get_by_ext(efforts.fresh_ool_by_ext,
                i->get_type()).increment(i->get_length());
-    i->prepare_commit();
     if (is_backref_mapped_type(i->get_type())) {
       laddr_t alloc_laddr;
       if (i->is_logical()) {

src/crimson/os/seastore/cache.h

@@ -186,7 +186,7 @@ class Cache : public ExtentTransViewRetriever {
     return t.root;
   }
 
-  void account_absent_access(Transaction::src_t src) final {
+  void account_absent_access(Transaction::src_t src) {
     ++(get_by_src(stats.cache_absent_by_src, src));
     ++stats.access.cache_absent;
   }

src/crimson/os/seastore/cached_extent.h

@@ -1388,12 +1388,15 @@ class LogicalCachedExtent : public CachedExtent {
   template <typename... T>
   LogicalCachedExtent(T&&... t) : CachedExtent(std::forward<T>(t)...) {}
 
-  void on_rewrite(Transaction&, CachedExtent &extent, extent_len_t off) final {
+  void on_rewrite(Transaction &t, CachedExtent &extent, extent_len_t off) final {
     assert(get_type() == extent.get_type());
     auto &lextent = (LogicalCachedExtent&)extent;
     set_laddr((lextent.get_laddr() + off).checked_to_laddr());
+    do_on_rewrite(t, lextent);
   }
 
+  virtual void do_on_rewrite(Transaction &t, LogicalCachedExtent &extent) {}
+
   bool has_laddr() const {
     return laddr != L_ADDR_NULL;
   }

src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc

@@ -103,6 +103,7 @@ BtreeLBAMapping::get_logical_extent(Transaction &t)
     : get_key();
   auto v = p.template get_child<LogicalChildNode>(ctx.trans, ctx.cache, pos, k);
   if (!v.has_child()) {
+    ctx.cache.account_absent_access(ctx.trans.get_src());
     this->child_pos = v.get_child_pos();
   }
   return v;

src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h

@@ -94,6 +94,7 @@ struct LBAInternalNode
   template <typename... T>
   LBAInternalNode(T&&... t) :
     FixedKVInternalNode(std::forward<T>(t)...) {}
+  static constexpr uint32_t CHILD_VEC_UNIT = 0;
 
   static constexpr extent_types_t TYPE = extent_types_t::LADDR_INTERNAL;
 
@@ -173,6 +174,7 @@ struct LBALeafNode
   using key_type = laddr_t;
   using parent_node_t = ParentNode<LBALeafNode, laddr_t>;
   using child_t = LogicalChildNode;
+  static constexpr uint32_t CHILD_VEC_UNIT = 0;
   LBALeafNode(ceph::bufferptr &&ptr)
     : parent_type_t(std::move(ptr)),
       parent_node_t(LEAF_NODE_CAPACITY) {}