crimson/os/seastore/backref: tolerate removing non-existing backrefs

Signed-off-by: Xuehan Xu <xxhdx1985126@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 9c0f2ba52412515502342b33ae437dfe488ea155..5371351ef69b2e2e06798d8daaa4abd3aae04a45 100644 (file)
--- a/src/crimson/os/seastore/backref/btree_backref_manager.cc
+++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc
@@ -376,8 +376,9 @@ BtreeBackrefManager::remove_mapping(
                -> remove_mapping_ret {
        if (iter.is_end() || iter.get_key() != addr) {
          LOG_PREFIX(BtreeBackrefManager::remove_mapping);
-         ERRORT("paddr={} doesn't exist", c.trans, addr);
-         return crimson::ct_error::enoent::make();
+         DEBUGT("paddr={} doesn't exist", c.trans, addr);
+         return remove_mapping_iertr::make_ready_future<
+           remove_mapping_result_t>(remove_mapping_result_t());
        }
 
        auto ret = remove_mapping_result_t{

diff --git a/src/crimson/os/seastore/backref_manager.h b/src/crimson/os/seastore/backref_manager.h
index f3f661086d59ceb4dd1cb864009be8911e97ae21..6e98f11b4f373c9e3981706c1c45eba5bace487b 100644 (file)
--- a/src/crimson/os/seastore/backref_manager.h
+++ b/src/crimson/os/seastore/backref_manager.h
@@ -128,9 +128,9 @@ public:
     const uint64_t max) = 0;
 
   struct remove_mapping_result_t {
-    paddr_t offset;
-    extent_len_t len;
-    laddr_t laddr;
+    paddr_t offset = P_ADDR_NULL;
+    extent_len_t len = 0;
+    laddr_t laddr = L_ADDR_NULL;
   };
 
   /**