update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rgw / rgw_period_history.cc

diff --git a/ceph/src/rgw/rgw_period_history.cc b/ceph/src/rgw/rgw_period_history.cc
index 6cbb2325dd245ed50bd45f3ee91a639f31cf9900..67c63e7beaa41e60c3ee88972bfa67e36eb662ad 100644 (file)
--- a/ceph/src/rgw/rgw_period_history.cc
+++ b/ceph/src/rgw/rgw_period_history.cc
@@ -2,7 +2,6 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "rgw_period_history.h"
-#include "rgw_rados.h"
 #include "rgw_zone.h"
 
 #include "include/ceph_assert.h"
@@ -86,7 +85,7 @@ class RGWPeriodHistory::Impl final {
   ~Impl();
 
   Cursor get_current() const { return current_cursor; }
-  Cursor attach(RGWPeriod&& period);
+  Cursor attach(RGWPeriod&& period, optional_yield y);
   Cursor insert(RGWPeriod&& period);
   Cursor lookup(epoch_t realm_epoch);
 
@@ -149,7 +148,7 @@ RGWPeriodHistory::Impl::~Impl()
   histories.clear_and_dispose(std::default_delete<History>{});
 }
 
-Cursor RGWPeriodHistory::Impl::attach(RGWPeriod&& period)
+Cursor RGWPeriodHistory::Impl::attach(RGWPeriod&& period, optional_yield y)
 {
   if (current_history == histories.end()) {
     return Cursor{-EINVAL};
@@ -185,7 +184,7 @@ Cursor RGWPeriodHistory::Impl::attach(RGWPeriod&& period)
     }
 
     // pull the period outside of the lock
-    int r = puller->pull(predecessor_id, period);
+    int r = puller->pull(predecessor_id, period, y);
     if (r < 0) {
       return Cursor{r};
     }
@@ -340,9 +339,9 @@ Cursor RGWPeriodHistory::get_current() const
 {
   return impl->get_current();
 }
-Cursor RGWPeriodHistory::attach(RGWPeriod&& period)
+Cursor RGWPeriodHistory::attach(RGWPeriod&& period, optional_yield y)
 {
-  return impl->attach(std::move(period));
+  return impl->attach(std::move(period), y);
 }
 Cursor RGWPeriodHistory::insert(RGWPeriod&& period)
 {