crimson/os/seastore/seastore_types: introduce base_ertr

Instead of decalring base_ertr and base_iertr in every file or
class that use them -
* Move base_ertr decleration to the common seastore_types header.
  Note: the price for that is including errorator in seastore_types
        though this seems reasonable considering the benefits.
* Move base_iertr to transaction_interruptor where trans_iertr
  is defined.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 308b1d6226140b524a1db15f736e65a04d193f94..45eab27c9f8b1252126aedb7030400b31f019447 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -22,8 +22,13 @@
 #include "include/uuid.h"
 #include "include/rados.h"
 
+#include "crimson/common/errorator.h"
+
 namespace crimson::os::seastore {
 
+using base_ertr = crimson::errorator<
+  crimson::ct_error::input_output_error>;
+
 class cache_hint_t {
   enum hint_t {
     TOUCH,

diff --git a/src/crimson/os/seastore/transaction_interruptor.h b/src/crimson/os/seastore/transaction_interruptor.h
index d0522c23c19eb4fcbb5b7866de1989c494b1cc7f..587d95d68ff1e8c91018d06c2fde6e7728aaefbf 100644 (file)
--- a/src/crimson/os/seastore/transaction_interruptor.h
+++ b/src/crimson/os/seastore/transaction_interruptor.h
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "crimson/common/errorator.h"
+#include "crimson/os/seastore/seastore_types.h"
 #include "crimson/common/interruptible_future.h"
 
 namespace crimson::os::seastore {
@@ -62,6 +63,8 @@ using trans_iertr =
     E
   >;
 
+using base_iertr = trans_iertr<base_ertr>;
+
 template <typename F, typename... Args>
 auto with_trans_intr(Transaction &t, F &&f, Args&&... args) {
   return trans_intr::with_interruption_to_error<crimson::ct_error::eagain>(