RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: implement delete oids

Browse Source 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
This commit is contained in:
Abhishek Lekshmanan 2020-09-01 17:19:10 +02:00 committed by Pritha Srivastava
parent 00dbe323d1
commit cd69cfc553
3 changed files with 75 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rgw/services/svc_role.h
View File

@ -90,5 +90,21 @@ class RGWSI_Role: public RGWServiceInstance
const std::string& name,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp) = 0;
const DoutPrefixProvider *dpp) = 0;
virtual int delete_name(RGWSI_MetaBackend::Context *ctx,
const std::string& name,
const std::string& tenant,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp) = 0;
virtual int delete_path(RGWSI_MetaBackend::Context *ctx,
const std::string& role_id,
const std::string& path,
const std::string& tenant,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp) = 0;
};

51
src/rgw/services/svc_role_rados.cc
View File

@ -134,6 +134,22 @@ int RGWSI_Role_RADOS::read_name(RGWSI_MetaBackend::Context *ctx,
return 0;
}
static int delete_oid(RGWSI_MetaBackend::Context *ctx,
RGWSI_MetaBackend* meta_be,
const std::string& oid,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp)
{
RGWSI_MBSObj_RemoveParams params;
int r = meta_be->remove(ctx, oid, params, objv_tracker, y, dpp);
if (r < 0 && r != -ENOENT && r != -ECANCELED) {
ldout(meta_be->ctx(),0) << "ERROR: RGWSI_Role: could not remove oid = "
<< oid << " r = "<< r << dendl;
return r;
}
return 0;
}
int RGWSI_Role_RADOS::delete_info(RGWSI_MetaBackend::Context *ctx,
const std::string& role_id,
@ -141,13 +157,32 @@ int RGWSI_Role_RADOS::delete_info(RGWSI_MetaBackend::Context *ctx,
optional_yield y,
const DoutPrefixProvider *dpp)
{
RGWSI_MBSObj_RemoveParams params;
int r = svc.meta_be->remove(ctx, get_role_meta_key(role_id), params, objv_tracker, y, dpp);
if (r < 0 && r != -ENOENT && r != -ECANCELED) {
ldout(svc.meta_be->ctx(),0) << "ERROR: could not remove RGWRole, id = "
<< role_id << " r = "<< r << dendl;
return r;
}
return 0;
return delete_oid(ctx, svc.meta_be, get_role_meta_key(role_id),
objv_tracker, y, dpp);
}
int RGWSI_Role_RADOS::delete_name(RGWSI_MetaBackend::Context *ctx,
const std::string& name,
const std::string& tenant,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp)
{
return delete_oid(ctx, svc.meta_be, get_role_name_meta_key(name, tenant),
objv_tracker, y, dpp);
}
int RGWSI_Role_RADOS::delete_path(RGWSI_MetaBackend::Context *ctx,
const std::string& role_id,
const std::string& path,
const std::string& tenant,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp)
{
return delete_oid(ctx, svc.meta_be, get_role_path_meta_key(path, role_id, tenant),
objv_tracker, y, dpp);
}

15
src/rgw/services/svc_role_rados.h
View File

@ -98,6 +98,21 @@ class RGWSI_Role_RADOS: public RGWSI_Role
optional_yield y,
const DoutPrefixProvider *dpp) override;
int delete_name(RGWSI_MetaBackend::Context *ctx,
const std::string& name,
const std::string& tenant,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp) override;
int delete_path(RGWSI_MetaBackend::Context *ctx,
const std::string& role_id,
const std::string& path,
const std::string& tenant,
RGWObjVersionTracker * const objv_tracker,
optional_yield y,
const DoutPrefixProvider *dpp) override;
private:
RGWSI_MetaBackend_Handler *be_handler;