crimson/os/seastore/backref_manager: scan backref entries by journal seq

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.cc b/src/crimson/os/seastore/backref/btree_backref_manager.cc
index ce3f737b21a8e7077e63d1fc614141ca68e8e0fd..8be43f5ade5c5918deddd3ea0ae00888c5321d12 100644 (file)
--- a/src/crimson/os/seastore/backref/btree_backref_manager.cc
+++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc
@@ -397,34 +397,37 @@ BtreeBackrefManager::scan_mapped_space(
       );
     }).si_then([this, &scan_visitor, c, FNAME, block_size] {
       // traverse alloc-deltas in order
-      auto &backref_entry_mset = cache.get_backref_entry_mset();
-      DEBUGT("scan {} backref entries", c.trans, backref_entry_mset.size());
-      for (auto &backref_entry : backref_entry_mset) {
-       if (backref_entry.laddr == L_ADDR_NULL) {
-         TRACET("backref entry {}~{} {} free",
-                c.trans,
-                backref_entry.paddr,
-                backref_entry.len,
-                backref_entry.type);
-       } else {
-         TRACET("backref entry {}~{} {}~{} {} used",
-                c.trans,
-                backref_entry.paddr,
-                backref_entry.len,
-                backref_entry.laddr,
-                backref_entry.len,
-                backref_entry.type);
-       }
-       ceph_assert(backref_entry.paddr.is_absolute());
-       ceph_assert(backref_entry.len > 0 &&
-                   backref_entry.len % block_size == 0);
-       ceph_assert(!is_backref_node(backref_entry.type));
-       scan_visitor(
-           backref_entry.paddr,
+      auto &backref_entryrefs = cache.get_backref_entryrefs_by_seq();
+      for (auto &[seq, refs] : backref_entryrefs) {
+       boost::ignore_unused(seq);
+       DEBUGT("scan {} backref entries", c.trans, refs.size());
+       for (auto &backref_entry : refs) {
+         if (backref_entry->laddr == L_ADDR_NULL) {
+           TRACET("backref entry {}~{} {} free",
+                  c.trans,
+                  backref_entry->paddr,
+                  backref_entry->len,
+                  backref_entry->type);
+         } else {
+           TRACET("backref entry {}~{} {}~{} {} used",
+                  c.trans,
+                  backref_entry->paddr,
+                  backref_entry->len,
+                  backref_entry->laddr,
+                  backref_entry->len,
+                  backref_entry->type);
+         }
+         ceph_assert(backref_entry->paddr.is_absolute());
+         ceph_assert(backref_entry->len > 0 &&
+                     backref_entry->len % block_size == 0);
+         ceph_assert(!is_backref_node(backref_entry->type));
+         scan_visitor(
+           backref_entry->paddr,
            P_ADDR_NULL,
-           backref_entry.len,
-           backref_entry.type,
-           backref_entry.laddr);
+           backref_entry->len,
+           backref_entry->type,
+           backref_entry->laddr);
+       }
       }
     }).si_then([this, &scan_visitor, block_size, c, FNAME] {
       BackrefBtree::mapped_space_visitor_t f =