From 72d1a363263cf707d022ee756122236ba175cda2 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Mon, 18 Jan 2021 12:25:39 -0500 Subject: 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 --- src/rgw/rgw_rest_config.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/rgw/rgw_rest_config.cc') 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(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); -- cgit v1.2.3