crimson/.../lba_manager: convert clone_mapping to use cursors

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

diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc
index effee7336a0c7c4723ff1163615dd40485a1fb2c..caf0af35da82af1866fe4c502fc15690ddff95f2 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc
@@ -313,46 +313,30 @@ BtreeLBAManager::alloc_extents(
 BtreeLBAManager::clone_mapping_ret
 BtreeLBAManager::clone_mapping(
   Transaction &t,
-  LBAMapping pos,
-  LBAMapping mapping,
+  LBACursorRef pos,
+  LBACursorRef mapping,
   laddr_t laddr,
-  extent_len_t offset,
+  laddr_t inter_key,
   extent_len_t len,
   bool updateref)
 {
   LOG_PREFIX(BtreeLBAManager::clone_mapping);
-  assert(pos.is_viewable());
-  assert(mapping.is_viewable());
-  DEBUGT("pos={}, mapping={}, laddr={}, {}~{} updateref={}",
-    t, pos, mapping, laddr, offset, len, updateref);
-  assert(offset + len <= mapping.get_length());
+  assert(pos->is_viewable());
+  assert(mapping->is_viewable());
+  DEBUGT("pos={}, mapping={}, laddr={}~{}, inter_key={} updateref={}",
+        t, *pos, *mapping, laddr, len, inter_key, updateref);
+  assert(inter_key.get_byte_distance<extent_len_t>(mapping->get_laddr()) + len
+        <= mapping->get_length());
   auto c = get_context(t);
   if (updateref) {
-    if (!mapping.direct_cursor) {
-      mapping.direct_cursor = co_await resolve_indirect_cursor(
-       c, *mapping.indirect_cursor);
-    }
-    assert(mapping.direct_cursor->is_viewable());
-    auto res = co_await update_refcount(
-      c.trans, mapping.direct_cursor.get(), 1
-    ).handle_error_interruptible(
-      clone_mapping_iertr::pass_further{},
-      crimson::ct_error::assert_all{"unexpected error"}
-    );
-    assert(!res.mapping.is_indirect());
-    mapping.direct_cursor = std::move(res.mapping.direct_cursor);
+    mapping = co_await update_mapping_refcount(c.trans, mapping, 1);
   }
   auto btree = co_await get_btree<LBABtree>(cache, c);
-  auto &cursor = pos.get_effective_cursor();
-  co_await cursor.refresh();
-  assert(laddr + len <= cursor.key);
-  auto inter_key = mapping.is_indirect()
-    ? mapping.get_intermediate_key()
-    : mapping.get_key();
-  inter_key = (inter_key + offset).checked_to_laddr();
+  co_await pos->refresh();
+  assert(laddr + len <= pos->get_laddr());
   auto p = co_await btree.insert(
     c,
-    btree.make_partial_iter(c, cursor),
+    btree.make_partial_iter(c, *pos),
     laddr,
     lba_map_val_t{len, inter_key, EXTENT_DEFAULT_REF_COUNT, 0});
   auto &[iter, inserted] = p;
@@ -361,9 +345,9 @@ BtreeLBAManager::clone_mapping(
     iter.get_leaf_pos(),
     get_reserved_ptr<LBALeafNode, laddr_t>(),
     leaf_node.get_size() - 1 /*the size before the insert*/);
-  mapping = co_await mapping.refresh();
+  co_await mapping->refresh();
   co_return clone_mapping_ret_t{
-    LBAMapping(mapping.direct_cursor, iter.get_cursor(c)),
+    iter.get_cursor(c),
     mapping};
 }
 

diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.h b/src/crimson/os/seastore/lba/btree_lba_manager.h
index 7027430e262b3c3e0446e560854b616269740061..9cd41cef08caf075dc79e9f82283fc083cd6a6d3 100644 (file)
--- a/src/crimson/os/seastore/lba/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba/btree_lba_manager.h
@@ -96,10 +96,10 @@ public:
 
   clone_mapping_ret clone_mapping(
     Transaction &t,
-    LBAMapping pos,
-    LBAMapping mapping,
+    LBACursorRef pos,
+    LBACursorRef mapping,
     laddr_t laddr,
-    extent_len_t offset,
+    laddr_t inter_key,
     extent_len_t len,
     bool updateref) final;
 

diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h
index c48a8f99e5c8badad2bd6fc45810fe0be1a2a991..c1543d4bcf047425998a6c2ec9e9070edc04030c 100644 (file)
--- a/src/crimson/os/seastore/lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager.h
@@ -91,8 +91,8 @@ public:
     std::vector<LogicalChildNodeRef> ext) = 0;
 
   struct clone_mapping_ret_t {
-    LBAMapping cloned_mapping;
-    LBAMapping orig_mapping;
+    LBACursorRef cloned_mapping;
+    LBACursorRef orig_mapping;
   };
   using clone_mapping_iertr = alloc_extent_iertr;
   using clone_mapping_ret = clone_mapping_iertr::future<clone_mapping_ret_t>;
@@ -101,11 +101,11 @@ public:
    */
   virtual clone_mapping_ret clone_mapping(
     Transaction &t,
-    LBAMapping pos,            // the destined position
-    LBAMapping mapping,                // the mapping to be cloned
+    LBACursorRef pos,          // the destined position
+    LBACursorRef mapping,      // the mapping to be cloned
     laddr_t laddr,             // the new lba key of the cloned mapping
-    extent_len_t offset,       // the offset of the part to be cloned,
-                               // relative to the start of the mapping.
+    laddr_t inter_key,         // offset within mapping of the target of the
+                                // clone
     extent_len_t len,          // the length of the part to be cloned
     bool updateref             // whether to update the refcount of the
                                // direct mapping

diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h
index 98437b593a066a8a12246b7a9fbdfbe40a3edc38..d6fd21ada6abab795236812a30d2f22e64cd1172 100644 (file)
--- a/src/crimson/os/seastore/transaction_manager.h
+++ b/src/crimson/os/seastore/transaction_manager.h
@@ -553,8 +553,12 @@ public:
    * for the definition of "indirect lba mapping" and "direct lba mapping".
    * Note that the cloned extent must be stable
    */
-  using clone_extent_iertr = LBAManager::clone_mapping_iertr;
-  using clone_extent_ret = LBAManager::clone_mapping_ret;
+  struct clone_pin_ret {
+    LBAMapping cloned_mapping;
+    LBAMapping orig_mapping;
+  };
+  using clone_extent_iertr = base_iertr;
+  using clone_extent_ret = clone_extent_iertr::future<clone_pin_ret>;
   clone_extent_ret clone_pin(
     Transaction &t,
     LBAMapping pos,
@@ -566,19 +570,27 @@ public:
     LOG_PREFIX(TransactionManager::clone_pin);
     SUBDEBUGT(seastore_tm, "{} clone to hint {} ... pos={}, updateref={}",
       t, mapping, hint, pos, updateref);
+    ceph_assert(!pos.is_indirect());
     pos = co_await pos.refresh();
-    mapping = co_await mapping.refresh();
+    mapping = co_await complete_mapping(t, mapping);
+    laddr_t inter_key = mapping.is_indirect() ?
+      mapping.get_intermediate_key() :
+      mapping.get_key();
+    inter_key = (inter_key + offset).checked_to_laddr();
     auto ret = co_await lba_manager->clone_mapping(
       t,
-      std::move(pos),
-      std::move(mapping),
+      pos.get_effective_cursor_ref(),
+      std::move(mapping.direct_cursor),
       hint,
-      offset,
+      inter_key,
       len,
       updateref
     );
-    SUBDEBUGT(seastore_tm, "cloned as {}", t, ret.cloned_mapping);
-    co_return ret;
+    SUBDEBUGT(seastore_tm, "cloned as {}", t, *ret.cloned_mapping);
+    co_return clone_pin_ret{
+      LBAMapping::create_indirect(ret.orig_mapping, ret.cloned_mapping),
+      LBAMapping(ret.orig_mapping, std::move(mapping.indirect_cursor))
+    };
   }
 
   struct clone_range_ret_t {