summaryrefslogtreecommitdiffstats
path: root/src/rgw/rgw_rest_config.cc
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@redhat.com>2021-01-18 18:25:39 +0100
committerDaniel Gryniewicz <dang@redhat.com>2021-03-02 13:35:05 +0100
commit72d1a363263cf707d022ee756122236ba175cda2 (patch)
tree3eaf8e8726594a33f23b56a0ad790953a6693986 /src/rgw/rgw_rest_config.cc
parentMerge pull request #39714 from zdover23/wip-doc-cephadm-typo-togeter-2021-Feb-26 (diff)
downloadceph-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_rest_config.cc')
-rw-r--r--src/rgw/rgw_rest_config.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_rest_config.cc b/src/rgw/rgw_rest_config.cc
index 9d906ec4c7b..446e2792eb0 100644
--- a/src/rgw/rgw_rest_config.cc
+++ b/src/rgw/rgw_rest_config.cc
@@ -31,7 +31,7 @@
#define dout_subsys ceph_subsys_rgw
void RGWOp_ZoneGroupMap_Get::execute(optional_yield y) {
- op_ret = zonegroup_map.read(g_ceph_context, store->svc()->sysobj, y);
+ op_ret = zonegroup_map.read(g_ceph_context, static_cast<rgw::sal::RGWRadosStore*>(store)->svc()->sysobj, y);
if (op_ret < 0) {
dout(5) << "failed to read zone_group map" << dendl;
}
@@ -59,7 +59,7 @@ void RGWOp_ZoneGroupMap_Get::send_response() {
}
void RGWOp_ZoneConfig_Get::send_response() {
- const RGWZoneParams& zone_params = store->svc()->zone->get_zone_params();
+ const RGWZoneParams& zone_params = store->get_zone_params();
set_req_state_err(s, op_ret);
dump_errno(s);