crimson/os/seastore/cache: pass missing src to touch_extent()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index 6f795392e332ad835329d13a5c8f180873015808..6990bf183a200c0b6cbc4e6a243a25e6abb37ed9 100644 (file)
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -1342,7 +1342,7 @@ record_t Cache::prepare_record(
     i->state = CachedExtent::extent_state_t::CLEAN;
     assert(i->is_logical());
     i->clear_modified_region();
-    touch_extent(*i);
+    touch_extent(*i, &trans_src);
     DEBUGT("inplace rewrite ool block is commmitted -- {}", t, *i);
   }
 
@@ -1895,7 +1895,7 @@ Cache::replay_delta(
         nullptr,
         [](CachedExtent &) {},
         [this](CachedExtent &ext) {
-          touch_extent(ext);
+          touch_extent(ext, nullptr);
         }) :
       _get_extent_if_cached(
        delta.paddr)

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index df908582a5890c3516889973a897b1050c46f1b3..4d6cb356a9db6f53d5f0c3c9db0309594b12bdbe 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -327,7 +327,8 @@ public:
     SUBDEBUGT(seastore_cache, "{} {} is present in cache -- {}",
               t, type, offset, *ret);
     t.add_to_read_set(ret);
-    touch_extent(*ret);
+    const auto t_src = t.get_src();
+    touch_extent(*ret, &t_src);
     return ret->wait_io().then([ret] {
       return get_extent_if_cached_iertr::make_ready_future<
         CachedExtentRef>(ret);
@@ -383,7 +384,8 @@ public:
                 t, T::TYPE, offset, length);
       auto f = [&t, this](CachedExtent &ext) {
         t.add_to_read_set(CachedExtentRef(&ext));
-        touch_extent(ext);
+        const auto t_src = t.get_src();
+        touch_extent(ext, &t_src);
       };
       auto metric_key = std::make_pair(t.get_src(), T::TYPE);
       return trans_intr::make_interruptible(
@@ -420,7 +422,8 @@ public:
              t, T::TYPE, offset, length);
     auto f = [&t, this](CachedExtent &ext) {
       t.add_to_read_set(CachedExtentRef(&ext));
-      touch_extent(ext);
+      const auto t_src = t.get_src();
+      touch_extent(ext, &t_src);
     };
     auto metric_key = std::make_pair(t.get_src(), T::TYPE);
     return trans_intr::make_interruptible(
@@ -494,7 +497,8 @@ public:
         // stable from trans-view
         assert(!p_extent->is_pending_in_trans(t.get_trans_id()));
         if (t.maybe_add_to_read_set(p_extent)) {
-          touch_extent(*p_extent);
+          const auto t_src = t.get_src();
+          touch_extent(*p_extent, &t_src);
         }
       }
     } else {
@@ -510,7 +514,6 @@ public:
       }
     }
 
-    assert(p_extent->is_stable() || p_extent->is_exist_clean());
     // user should not see RETIRED_PLACEHOLDER extents
     ceph_assert(p_extent->get_type() != extent_types_t::RETIRED_PLACEHOLDER);
     if (!p_extent->is_fully_loaded()) {
@@ -723,7 +726,8 @@ private:
                 t, type, offset, length, laddr);
       auto f = [&t, this](CachedExtent &ext) {
        t.add_to_read_set(CachedExtentRef(&ext));
-       touch_extent(ext);
+       const auto t_src = t.get_src();
+       touch_extent(ext, &t_src);
       };
       auto src = t.get_src();
       return trans_intr::make_interruptible(
@@ -757,7 +761,8 @@ private:
              t, type, offset, length, laddr);
     auto f = [&t, this](CachedExtent &ext) {
       t.add_to_read_set(CachedExtentRef(&ext));
-      touch_extent(ext);
+      const auto t_src = t.get_src();
+      touch_extent(ext, &t_src);
     };
     auto src = t.get_src();
     return trans_intr::make_interruptible(
@@ -1350,7 +1355,7 @@ private:
   /// Update lru for access to ref
   void touch_extent(
       CachedExtent &ext,
-      const Transaction::src_t* p_src=nullptr)
+      const Transaction::src_t* p_src)
   {
     if (p_src &&
        is_background_transaction(*p_src) &&