From 12008a84fa6f4243368829e82e3cc3ca7385ae05 Mon Sep 17 00:00:00 2001
From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Mon, 16 Aug 2021 16:09:59 +0800
Subject: [PATCH] Revert "crimson/onode-staged-tree: force test work with
 invalidated transactions"

This reverts commit 8b6428c4ac08a7d3beabf64f549bfe11e5245978.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---
 .../staged-fltree/node_extent_accessor.h             |  8 ++------
 .../staged-fltree/node_extent_manager/seastore.h     | 12 ++++--------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
index 5b13e15e88c6c..bec13d2b918f5 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
@@ -561,9 +561,7 @@ class NodeExtentAccessorT {
         })
       );
     }).si_then([this, c] {
-      // FIXME: interruptive-future failed to check invalidation
-      // assert(!c.t.is_conflicted());
-      std::ignore = c;
+      assert(!c.t.is_conflicted());
       return *mut;
     });
   }
@@ -587,9 +585,7 @@ class NodeExtentAccessorT {
       })
 #ifndef NDEBUG
     ).si_then([c] {
-      // FIXME: interruptive-future failed to check invalidation
-      // assert(!c.t.is_conflicted());
-      std::ignore = c;
+      assert(!c.t.is_conflicted());
     }
 #endif
     );
diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h
index ccfd1721b9293..3ff51d0542e3b 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h
@@ -107,8 +107,7 @@ class SeastoreNodeExtentManager final: public TransactionManagerHandle {
       if (trigger_eagain()) {
         DEBUGT("reading at {:#x}: trigger eagain", t, addr);
         t.test_set_conflict();
-        // FIXME: interruptive-future failed to check invalidation
-        // return read_iertr::make_ready_future<NodeExtentRef>();
+        return read_iertr::make_ready_future<NodeExtentRef>();
       }
     }
     return tm.read_extent<SeastoreNodeExtent>(t, addr
@@ -128,8 +127,7 @@ class SeastoreNodeExtentManager final: public TransactionManagerHandle {
       if (trigger_eagain()) {
         DEBUGT("allocating {}B: trigger eagain", t, len);
         t.test_set_conflict();
-        // FIXME: interruptive-future failed to check invalidation
-        // return alloc_iertr::make_ready_future<NodeExtentRef>();
+        return alloc_iertr::make_ready_future<NodeExtentRef>();
       }
     }
     return tm.alloc_extent<SeastoreNodeExtent>(t, hint, len
@@ -159,8 +157,7 @@ class SeastoreNodeExtentManager final: public TransactionManagerHandle {
         DEBUGT("retiring {}B at {:#x} -- {} : trigger eagain",
                t, len, addr, *extent);
         t.test_set_conflict();
-        // FIXME: interruptive-future failed to check invalidation
-        // return retire_iertr::now();
+        return retire_iertr::now();
       }
     }
     return tm.dec_ref(t, extent).si_then([addr, len, &t] (unsigned cnt) {
@@ -176,8 +173,7 @@ class SeastoreNodeExtentManager final: public TransactionManagerHandle {
       if (trigger_eagain()) {
         DEBUGT("get root: trigger eagain", t);
         t.test_set_conflict();
-        // FIXME: interruptive-future failed to check invalidation
-        // return getsuper_iertr::make_ready_future<Super::URef>();
+        return getsuper_iertr::make_ready_future<Super::URef>();
       }
     }
     return tm.read_onode_root(t).si_then([this, &t, &tracker](auto root_addr) {
-- 
2.39.5