From 6160ad80e1181fcfa2b217d83655b38b1691d9f0 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Tue, 17 Aug 2021 12:17:27 +0800 Subject: [PATCH] test/crimson: avoid creating interrupt condition within an already interruptible continuation chain Signed-off-by: Xuehan Xu --- .../crimson/seastore/onode_tree/test_fltree_onode_manager.cc | 2 +- src/test/crimson/seastore/transaction_manager_test_state.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc b/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc index 846b6fc9c71ec..b132ec29dd2ac 100644 --- a/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc +++ b/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc @@ -90,7 +90,7 @@ struct fltree_onode_manager_test_t return with_trans_intr(*ref_t, [&](auto &t) { return manager->mkfs(t ).si_then([this, &t] { - return submit_transaction_fut(t); + return submit_transaction_fut2(t); }); }); }); diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index d95fa45e164a3..a4abee896014a 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -157,6 +157,10 @@ protected: return tm->create_weak_transaction(Transaction::src_t::READ); } + auto submit_transaction_fut2(Transaction& t) { + return tm->submit_transaction(t); + } + auto submit_transaction_fut(Transaction &t) { return with_trans_intr( t, -- 2.39.5