From: Casey Bodley Date: Fri, 1 Dec 2023 21:51:11 +0000 (-0500) Subject: rgw/services: remove unused RGWOTPCtl X-Git-Tag: v20.0.0~1070^2~15 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b017975d67376eba7370966c61b0d7f68461f1e6;p=ceph.git rgw/services: remove unused RGWOTPCtl Signed-off-by: Casey Bodley --- diff --git a/src/rgw/driver/rados/rgw_otp.cc b/src/rgw/driver/rados/rgw_otp.cc index 07cc14f113b5f..7ad279106ee80 100644 --- a/src/rgw/driver/rados/rgw_otp.cc +++ b/src/rgw/driver/rados/rgw_otp.cc @@ -55,7 +55,6 @@ public: class RGWOTPMetadataHandler : public RGWOTPMetadataHandlerBase { - friend class RGWOTPCtl; struct Svc { RGWSI_Zone *zone; @@ -157,54 +156,6 @@ public: string get_type() override { return "otp"; } }; - -RGWOTPCtl::RGWOTPCtl(RGWSI_Zone *zone_svc, - RGWSI_OTP *otp_svc) -{ - svc.zone = zone_svc; - svc.otp = otp_svc; -} - - -void RGWOTPCtl::init(RGWOTPMetadataHandler *_meta_handler) -{ - meta_handler = _meta_handler; - be_handler = meta_handler->get_be_handler(); -} - -int RGWOTPCtl::read_all(const rgw_user& uid, - RGWOTPInfo *info, - optional_yield y, - const DoutPrefixProvider *dpp, - const GetParams& params) -{ - info->uid = uid; - return meta_handler->call([&](RGWSI_OTP_BE_Ctx& ctx) { - return svc.otp->read_all(ctx, uid, &info->devices, params.mtime, params.objv_tracker, y, dpp); - }); -} - -int RGWOTPCtl::store_all(const DoutPrefixProvider *dpp, - const RGWOTPInfo& info, - optional_yield y, - const PutParams& params) -{ - return meta_handler->call([&](RGWSI_OTP_BE_Ctx& ctx) { - return svc.otp->store_all(dpp, ctx, info.uid, info.devices, params.mtime, params.objv_tracker, y); - }); -} - -int RGWOTPCtl::remove_all(const DoutPrefixProvider *dpp, - const rgw_user& uid, - optional_yield y, - const RemoveParams& params) -{ - return meta_handler->call([&](RGWSI_OTP_BE_Ctx& ctx) { - return svc.otp->remove_all(dpp, ctx, uid, params.objv_tracker, y); - }); -} - - RGWMetadataHandler *RGWOTPMetaHandlerAllocator::alloc() { return new RGWOTPMetadataHandler(); diff --git a/src/rgw/driver/rados/rgw_otp.h b/src/rgw/driver/rados/rgw_otp.h index 885e8abb8e1d7..1fca8d0b5c7d7 100644 --- a/src/rgw/driver/rados/rgw_otp.h +++ b/src/rgw/driver/rados/rgw_otp.h @@ -30,81 +30,3 @@ class RGWOTPMetaHandlerAllocator { public: static RGWMetadataHandler *alloc(); }; - -struct RGWOTPInfo { - rgw_user uid; - otp_devices_list_t devices; -}; - - -class RGWOTPCtl -{ - struct Svc { - RGWSI_Zone *zone{nullptr}; - RGWSI_OTP *otp{nullptr}; - } svc; - - RGWOTPMetadataHandler *meta_handler; - RGWSI_MetaBackend_Handler *be_handler; - -public: - RGWOTPCtl(RGWSI_Zone *zone_svc, - RGWSI_OTP *otp_svc); - - void init(RGWOTPMetadataHandler *_meta_handler); - - struct GetParams { - RGWObjVersionTracker *objv_tracker{nullptr}; - ceph::real_time *mtime{nullptr}; - - GetParams() {} - - GetParams& set_objv_tracker(RGWObjVersionTracker *_objv_tracker) { - objv_tracker = _objv_tracker; - return *this; - } - - GetParams& set_mtime(ceph::real_time *_mtime) { - mtime = _mtime; - return *this; - } - }; - - struct PutParams { - RGWObjVersionTracker *objv_tracker{nullptr}; - ceph::real_time mtime; - - PutParams() {} - - PutParams& set_objv_tracker(RGWObjVersionTracker *_objv_tracker) { - objv_tracker = _objv_tracker; - return *this; - } - - PutParams& set_mtime(const ceph::real_time& _mtime) { - mtime = _mtime; - return *this; - } - }; - - struct RemoveParams { - RGWObjVersionTracker *objv_tracker{nullptr}; - - RemoveParams() {} - - RemoveParams& set_objv_tracker(RGWObjVersionTracker *_objv_tracker) { - objv_tracker = _objv_tracker; - return *this; - } - }; - - int read_all(const rgw_user& uid, RGWOTPInfo *info, optional_yield y, - const DoutPrefixProvider *dpp, - const GetParams& params = {}); - int store_all(const DoutPrefixProvider *dpp, - const RGWOTPInfo& info, optional_yield y, - const PutParams& params = {}); - int remove_all(const DoutPrefixProvider *dpp, - const rgw_user& user, optional_yield y, - const RemoveParams& params = {}); -}; diff --git a/src/rgw/driver/rados/rgw_service.cc b/src/rgw/driver/rados/rgw_service.cc index 5e7dd81c7162f..7aa6552278d3b 100644 --- a/src/rgw/driver/rados/rgw_service.cc +++ b/src/rgw/driver/rados/rgw_service.cc @@ -404,7 +404,6 @@ int RGWCtlDef::init(RGWServices& svc, rgw::sal::Driver* driver, svc.bucket, svc.bucket_sync, svc.bi, svc.user)); - otp.reset(new RGWOTPCtl(svc.zone, svc.otp)); RGWBucketMetadataHandlerBase *bucket_meta_handler = static_cast(meta.bucket.get()); RGWBucketInstanceMetadataHandlerBase *bi_meta_handler = static_cast(meta.bucket_instance.get()); @@ -429,8 +428,6 @@ int RGWCtlDef::init(RGWServices& svc, rgw::sal::Driver* driver, svc.datalog_rados, dpp); - otp->init((RGWOTPMetadataHandler *)meta.otp.get()); - return 0; } @@ -457,7 +454,6 @@ int RGWCtl::init(RGWServices *_svc, rgw::sal::Driver* driver, user = _ctl.user.get(); bucket = _ctl.bucket.get(); - otp = _ctl.otp.get(); r = meta.user->attach(meta.mgr); if (r < 0) { diff --git a/src/rgw/driver/rados/rgw_service.h b/src/rgw/driver/rados/rgw_service.h index ec7f73cf6eb50..13c84af830668 100644 --- a/src/rgw/driver/rados/rgw_service.h +++ b/src/rgw/driver/rados/rgw_service.h @@ -183,7 +183,6 @@ class RGWMetadataManager; class RGWMetadataHandler; class RGWUserCtl; class RGWBucketCtl; -class RGWOTPCtl; template class RGWChainedCacheImpl; @@ -208,7 +207,6 @@ struct RGWCtlDef { std::unique_ptr user; std::unique_ptr bucket; - std::unique_ptr otp; RGWCtlDef(); ~RGWCtlDef(); @@ -238,7 +236,6 @@ struct RGWCtl { RGWUserCtl *user{nullptr}; RGWBucketCtl *bucket{nullptr}; - RGWOTPCtl *otp{nullptr}; int init(RGWServices *_svc, rgw::sal::Driver* driver, librados::Rados& rados, const DoutPrefixProvider *dpp);