From ae9d15f670819ca2aebe9c7c3f43a6dfbda36cde Mon Sep 17 00:00:00 2001
From: Samuel Just <sjust@redhat.com>
Date: Wed, 13 Jan 2021 23:40:17 -0800
Subject: [PATCH] crimson/common/errorator: add extend_ertr helper for merging
 errorators

Signed-off-by: Samuel Just <sjust@redhat.com>
---
 src/crimson/common/errorator.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index af1e6ea45c8..746bd9bb51d 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -776,7 +776,7 @@ public:
     return all_same_way_t<ErrorFunc>{std::forward<ErrorFunc>(error_func)};
   };
 
-  // get a new errorator by extending current one with new error
+  // get a new errorator by extending current one with new errors
   template <class... NewAllowedErrorsT>
   using extend = errorator<AllowedErrors..., NewAllowedErrorsT...>;
 
@@ -813,6 +813,10 @@ public:
     using type = errorator<AllowedErrors...>;
   };
 
+  // get a new errorator by extending current one with another errorator
+  template <class E>
+  using extend_ertr = typename unify<E>::type;
+
   template <typename T=void, typename... A>
   static future<T> make_ready_future(A&&... value) {
     return future<T>(ready_future_marker(), std::forward<A>(value)...);
@@ -953,10 +957,14 @@ public:
   template <class T>
   using futurize = ::seastar::futurize<T>;
 
-  // get a new errorator by extending current one with new error
+  // get a new errorator by extending current one with errors
   template <class... NewAllowedErrors>
   using extend = errorator<NewAllowedErrors...>;
 
+  // get a new errorator by extending current one with another errorator
+  template <class E>
+  using extend_ertr = E;
+
   // errorator with empty error set never contains any error
   template <class T>
   static constexpr bool contains_once_v = false;
-- 
2.47.3