diff options
author | Daniel Gryniewicz <dang@redhat.com> | 2021-01-18 18:25:39 +0100 |
---|---|---|
committer | Daniel Gryniewicz <dang@redhat.com> | 2021-03-02 13:35:05 +0100 |
commit | 72d1a363263cf707d022ee756122236ba175cda2 (patch) | |
tree | 3eaf8e8726594a33f23b56a0ad790953a6693986 /src/rgw/rgw_zone.cc | |
parent | Merge pull request #39714 from zdover23/wip-doc-cephadm-typo-togeter-2021-Feb-26 (diff) | |
download | ceph-72d1a363263cf707d022ee756122236ba175cda2.tar.xz ceph-72d1a363263cf707d022ee756122236ba175cda2.zip |
RGW - Zipper 10: Pull The Thread
This commit changes the RGWStoreManager to return a RGWStore* rather
than a RGWRadosStore*. This is the thread that unravels the rest of the
Zipper work, removing hard-coded uses of the RGWRados* classes.
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
Diffstat (limited to 'src/rgw/rgw_zone.cc')
-rw-r--r-- | src/rgw/rgw_zone.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rgw/rgw_zone.cc b/src/rgw/rgw_zone.cc index 9886cc3ecfd..4798c057ea6 100644 --- a/src/rgw/rgw_zone.cc +++ b/src/rgw/rgw_zone.cc @@ -1372,13 +1372,13 @@ static int read_sync_status(rgw::sal::RGWRadosStore *store, rgw_meta_sync_status return r; } -int RGWPeriod::update_sync_status(rgw::sal::RGWRadosStore *store, /* for now */ +int RGWPeriod::update_sync_status(rgw::sal::RGWStore *store, /* for now */ const RGWPeriod ¤t_period, std::ostream& error_stream, bool force_if_stale) { rgw_meta_sync_status status; - int r = read_sync_status(store, &status); + int r = read_sync_status(static_cast<rgw::sal::RGWRadosStore*>(store), &status); if (r < 0) { ldout(cct, 0) << "period failed to read sync status: " << cpp_strerror(-r) << dendl; @@ -1422,8 +1422,8 @@ int RGWPeriod::update_sync_status(rgw::sal::RGWRadosStore *store, /* for now */ return 0; } -int RGWPeriod::commit(const DoutPrefixProvider *dpp, - rgw::sal::RGWRadosStore *store, +int RGWPeriod::commit(const DoutPrefixProvider *dpp, + rgw::sal::RGWStore *store, RGWRealm& realm, const RGWPeriod& current_period, std::ostream& error_stream, optional_yield y, bool force_if_stale) |