From: Samuel Just <sjust@redhat.com>
Date: Wed, 2 Jun 2021 03:05:12 +0000 (-0700)
Subject: crimson/common/interruptible_future: add common errorator forwards
X-Git-Tag: v17.1.0~1567^2~21
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=525bd1583d4627258b3043250d58b5ae449d9fb3;p=ceph-ci.git

crimson/common/interruptible_future: add common errorator forwards

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

diff --git a/src/crimson/common/interruptible_future.h b/src/crimson/common/interruptible_future.h
index 93230484318..9dc3e53c322 100644
--- a/src/crimson/common/interruptible_future.h
+++ b/src/crimson/common/interruptible_future.h
@@ -487,6 +487,16 @@ struct interruptible_errorator {
   using future = interruptible_future_detail<InterruptCond,
 	typename Errorator::template future<ValueT>>;
 
+  template <class... NewAllowedErrorsT>
+  using extend = interruptible_errorator<
+    InterruptCond,
+    typename Errorator::template extend<NewAllowedErrorsT...>>;
+
+  template <class Ertr>
+  using extend_ertr = interruptible_errorator<
+    InterruptCond,
+    typename Errorator::template extend_ertr<Ertr>>;
+
   template <typename ValueT = void, typename... A>
   static interruptible_future_detail<
     InterruptCond,
@@ -513,6 +523,10 @@ struct interruptible_errorator {
       InterruptCond, typename Errorator::template future<>>(
 	Errorator::now());
   }
+
+  using pass_further = typename Errorator::pass_further;
+  using ready_future_marker = ready_future_marker;
+  using exception_future_marker = exception_future_marker;
 };
 
 template <typename InterruptCond,