crimson/os/seastore: convert transaction_manager internally to use interruptible_future

Consumers of TransactionManager use wrapper classes InterruptedTransactionManager
and InterruptedTMRef for now until we convert them.

Also converts users of InterruptedCache etc and removes.

Signed-off-by: Samuel Just <sjust@redhat.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/crimson/os/seastore/collection_manager.h b/src/crimson/os/seastore/collection_manager.h
index 3b3abf2d36a..c5f708dd67f 100644
--- a/src/crimson/os/seastore/collection_manager.h
+++ b/src/crimson/os/seastore/collection_manager.h
@@ -26,9 +26,12 @@ struct coll_info_t {
 /// Interface for maintaining set of collections
 class CollectionManager {
 public:
-  using base_ertr = TransactionManager::read_extent_ertr;
+  using base_ertr = with_trans_ertr<
+    TransactionManager::read_extent_iertr>;
+
     /// Initialize collection manager instance for an empty store
-  using mkfs_ertr = TransactionManager::alloc_extent_ertr;
+  using mkfs_ertr = with_trans_ertr<
+    TransactionManager::alloc_extent_iertr>;
   using mkfs_ret = mkfs_ertr::future<coll_root_t>;
   virtual mkfs_ret mkfs(
     Transaction &t) = 0;
@@ -76,7 +79,7 @@ using CollectionManagerRef = std::unique_ptr<CollectionManager>;
 namespace collection_manager {
 /* creat CollectionMapManager for Collection  */
 CollectionManagerRef create_coll_manager(
-  TransactionManager &trans_manager);
+  InterruptedTransactionManager trans_manager);
 
 }