Merge pull request ceph#61261 from xxhdx1985126/wip-seastore-lba-backref-mapping

crimson/os/seastore: refactor LBAMapping

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

Author: cyx1231st

src/crimson/os/seastore/CMakeLists.txt

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

src/crimson/os/seastore/async_cleaner.h

@@ -17,6 +17,7 @@
 #include "crimson/os/seastore/randomblock_manager_group.h"
 #include "crimson/os/seastore/transaction.h"
 #include "crimson/os/seastore/segment_seq_allocator.h"
+#include "crimson/os/seastore/backref_mapping.h"
 
 namespace crimson::os::seastore {
 

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

@@ -9,44 +9,28 @@
 
 namespace crimson::os::seastore::backref {
 
-constexpr size_t BACKREF_BLOCK_SIZE = 4096;
-
-class BtreeBackrefMapping : public BtreeNodeMapping<paddr_t, laddr_t> {
-  extent_types_t type;
+class BtreeBackrefMapping : public BackrefMapping {
 public:
   BtreeBackrefMapping(op_context_t<paddr_t> ctx)
-    : BtreeNodeMapping(ctx) {}
+    : BackrefMapping(ctx) {}
   BtreeBackrefMapping(
     op_context_t<paddr_t> ctx,
     CachedExtentRef parent,
     uint16_t pos,
     backref_map_val_t &val,
     backref_node_meta_t &&meta)
-    : BtreeNodeMapping(
+    : BackrefMapping(
+	val.type,
 	ctx,
 	parent,
 	pos,
 	val.laddr,
 	val.len,
-	std::forward<backref_node_meta_t>(meta)),
-      type(val.type)
-  {}
-  extent_types_t get_type() const final {
-    return type;
-  }
-
-  bool is_clone() const final {
-    return false;
-  }
-
-protected:
-  std::unique_ptr<BtreeNodeMapping<paddr_t, laddr_t>> _duplicate(
-    op_context_t<paddr_t> ctx) const final {
-    return std::unique_ptr<BtreeNodeMapping<paddr_t, laddr_t>>(
-      new BtreeBackrefMapping(ctx));
-  }
+	std::forward<backref_node_meta_t>(meta)) {}
 };
 
+constexpr size_t BACKREF_BLOCK_SIZE = 4096;
+
 using BackrefBtree = FixedKVBtree<
   paddr_t, backref_map_val_t, BackrefInternalNode,
   BackrefLeafNode, BtreeBackrefMapping, BACKREF_BLOCK_SIZE, false>;

src/crimson/os/seastore/backref_manager.h

@@ -6,6 +6,7 @@
 #include "crimson/os/seastore/cache.h"
 #include "crimson/os/seastore/cached_extent.h"
 #include "crimson/os/seastore/transaction.h"
+#include "crimson/os/seastore/backref_mapping.h"
 
 namespace crimson::os::seastore {
 

src/crimson/os/seastore/backref_mapping.h

@@ -0,0 +1,27 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#pragma once
+
+#include "crimson/os/seastore/btree/btree_range_pin.h"
+
+namespace crimson::os::seastore {
+
+class BackrefMapping : public BtreeNodeMapping<paddr_t, laddr_t> {
+  extent_types_t type;
+public:
+  BackrefMapping(op_context_t<paddr_t> ctx)
+    : BtreeNodeMapping(ctx) {}
+  template <typename... T>
+  BackrefMapping(extent_types_t type, T&&... t)
+    : BtreeNodeMapping(std::forward<T>(t)...),
+      type(type) {}
+  extent_types_t get_type() const {
+    return type;
+  }
+};
+
+using BackrefMappingRef = std::unique_ptr<BackrefMapping>;
+using backref_pin_list_t = std::list<BackrefMappingRef>;
+
+} // namespace crimson::os::seastore

src/crimson/os/seastore/btree/btree_range_pin.cc

@@ -7,11 +7,12 @@
 
 #include "crimson/common/log.h"
 
-#include "crimson/os/seastore/cache.h"
 #include "crimson/os/seastore/cached_extent.h"
 #include "crimson/os/seastore/seastore_types.h"
+#include "crimson/os/seastore/transaction.h"
 
 namespace crimson::os::seastore {
+class Cache;
 
 template <typename node_key_t>
 struct op_context_t {
@@ -116,8 +117,6 @@ class BtreeNodeMapping : public PhysicalNodeMapping<key_t, val_t> {
   extent_len_t len = 0;
   fixed_kv_node_meta_t<key_t> range;
   uint16_t pos = std::numeric_limits<uint16_t>::max();
-
-  virtual std::unique_ptr<BtreeNodeMapping> _duplicate(op_context_t<key_t>) const = 0;
   fixed_kv_node_meta_t<key_t> _get_pin_range() const {
     return range;
   }
@@ -139,11 +138,7 @@ class BtreeNodeMapping : public PhysicalNodeMapping<key_t, val_t> {
       len(len),
       range(meta),
       pos(pos)
-  {
-    if (!parent->is_pending()) {
-      this->child_pos = {parent, pos};
-    }
-  }
+  {}
 
   CachedExtentRef get_parent() const final {
     return parent;
@@ -162,11 +157,6 @@ class BtreeNodeMapping : public PhysicalNodeMapping<key_t, val_t> {
     return len;
   }
 
-  extent_types_t get_type() const override {
-    ceph_abort("should never happen");
-    return extent_types_t::ROOT;
-  }
-
   val_t get_val() const final {
     if constexpr (std::is_same_v<val_t, paddr_t>) {
       return value.get_paddr();
@@ -180,16 +170,6 @@ class BtreeNodeMapping : public PhysicalNodeMapping<key_t, val_t> {
     return range.begin;
   }
 
-  PhysicalNodeMappingRef<key_t, val_t> duplicate() const final {
-    auto ret = _duplicate(ctx);
-    ret->range = range;
-    ret->value = value;
-    ret->parent = parent;
-    ret->len = len;
-    ret->pos = pos;
-    return ret;
-  }
-
   bool has_been_invalidated() const final {
     return parent->has_been_invalidated();
   }
@@ -215,9 +195,6 @@ class BtreeNodeMapping : public PhysicalNodeMapping<key_t, val_t> {
     return unviewable;
   }
 
-  get_child_ret_t<LogicalCachedExtent> get_logical_extent(Transaction&) final;
-  bool is_stable() const final;
-  bool is_data_stable() const final;
   bool is_parent_viewable() const final {
     ceph_assert(parent);
     if (!parent->is_valid()) {

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

@@ -7,6 +7,7 @@
 #include "crimson/common/log.h"
 
 #include "crimson/os/seastore/btree/fixed_kv_node.h"
+#include "crimson/os/seastore/lba_mapping.h"
 
 namespace {
   [[maybe_unused]] seastar::logger& logger() {
@@ -142,6 +143,12 @@ void LogicalCachedExtent::on_replace_prior() {
   parent->children[off] = this;
 }
 
+void LogicalCachedExtent::maybe_set_intermediate_laddr(LBAMapping &mapping) {
+  laddr = mapping.is_indirect()
+    ? mapping.get_intermediate_base()
+    : mapping.get_key();
+}
+
 parent_tracker_t::~parent_tracker_t() {
   // this is parent's tracker, reset it
   auto &p = (FixedKVNode<laddr_t>&)*parent;
@@ -150,32 +157,6 @@ parent_tracker_t::~parent_tracker_t() {
   }
 }
 
-std::ostream &operator<<(std::ostream &out, const LBAMapping &rhs)
-{
-  out << "LBAMapping(" << rhs.get_key()
-      << "~0x" << std::hex << rhs.get_length() << std::dec
-      << "->" << rhs.get_val();
-  if (rhs.is_indirect()) {
-    out << ",indirect(" << rhs.get_intermediate_base()
-        << "~0x" << std::hex << rhs.get_intermediate_length()
-        << "@0x" << rhs.get_intermediate_offset() << std::dec
-        << ")";
-  }
-  out << ")";
-  return out;
-}
-
-std::ostream &operator<<(std::ostream &out, const lba_pin_list_t &rhs)
-{
-  bool first = true;
-  out << '[';
-  for (const auto &i: rhs) {
-    out << (first ? "" : ",") << *i;
-    first = false;
-  }
-  return out << ']';
-}
-
 bool BufferSpace::is_range_loaded(extent_len_t offset, extent_len_t length) const
 {
   assert(length > 0);