From 0ead6ff010b1b7a68205227706833418283cf4d2 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 4 Oct 2023 12:49:10 -0400 Subject: [PATCH] rgw/sal: rename Bucket::remove_bucket() to remove() Signed-off-by: Casey Bodley --- src/rgw/driver/daos/rgw_sal_daos.cc | 12 ++++++------ src/rgw/driver/daos/rgw_sal_daos.h | 12 ++++++------ src/rgw/driver/motr/rgw_sal_motr.cc | 4 ++-- src/rgw/driver/motr/rgw_sal_motr.h | 4 ++-- src/rgw/driver/posix/rgw_sal_posix.cc | 20 ++++++++++---------- src/rgw/driver/posix/rgw_sal_posix.h | 12 ++++++------ src/rgw/driver/rados/rgw_bucket.cc | 4 ++-- src/rgw/driver/rados/rgw_rest_bucket.cc | 2 +- src/rgw/driver/rados/rgw_sal_rados.cc | 16 ++++++++-------- src/rgw/driver/rados/rgw_sal_rados.h | 10 +++++----- src/rgw/driver/rados/rgw_user.cc | 2 +- src/rgw/rgw_op.cc | 4 ++-- src/rgw/rgw_sal.h | 10 +++++----- src/rgw/rgw_sal_dbstore.cc | 10 +++++----- src/rgw/rgw_sal_dbstore.h | 10 +++++----- src/rgw/rgw_sal_filter.cc | 18 +++++++++--------- src/rgw/rgw_sal_filter.h | 12 ++++++------ 17 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/rgw/driver/daos/rgw_sal_daos.cc b/src/rgw/driver/daos/rgw_sal_daos.cc index 1bade37520329..3687f57b8c89f 100644 --- a/src/rgw/driver/daos/rgw_sal_daos.cc +++ b/src/rgw/driver/daos/rgw_sal_daos.cc @@ -404,8 +404,8 @@ std::unique_ptr DaosBucket::get_encoded_info( return bucket_info; } -int DaosBucket::remove_bucket(const DoutPrefixProvider* dpp, - bool delete_children, optional_yield y) { +int DaosBucket::remove(const DoutPrefixProvider* dpp, + bool delete_children, optional_yield y) { ldpp_dout(dpp, 20) << "DEBUG: remove_bucket, delete_children=" << delete_children << dendl; @@ -413,10 +413,10 @@ int DaosBucket::remove_bucket(const DoutPrefixProvider* dpp, nullptr); } -int DaosBucket::remove_bucket_bypass_gc(int concurrent_max, - bool keep_index_consistent, - optional_yield y, - const DoutPrefixProvider* dpp) { +int DaosBucket::remove_bypass_gc(int concurrent_max, + bool keep_index_consistent, + optional_yield y, + const DoutPrefixProvider* dpp) { ldpp_dout(dpp, 20) << "DEBUG: remove_bucket_bypass_gc, concurrent_max=" << concurrent_max diff --git a/src/rgw/driver/daos/rgw_sal_daos.h b/src/rgw/driver/daos/rgw_sal_daos.h index 8394fb2f75709..66f5700646323 100644 --- a/src/rgw/driver/daos/rgw_sal_daos.h +++ b/src/rgw/driver/daos/rgw_sal_daos.h @@ -289,12 +289,12 @@ class DaosBucket : public StoreBucket { virtual std::unique_ptr get_object(const rgw_obj_key& k) override; virtual int list(const DoutPrefixProvider* dpp, ListParams&, int, ListResults&, optional_yield y) override; - virtual int remove_bucket(const DoutPrefixProvider* dpp, bool delete_children, - optional_yield y) override; - virtual int remove_bucket_bypass_gc(int concurrent_max, - bool keep_index_consistent, - optional_yield y, - const DoutPrefixProvider* dpp) override; + virtual int remove(const DoutPrefixProvider* dpp, bool delete_children, + optional_yield y) override; + virtual int remove_bypass_gc(int concurrent_max, + bool keep_index_consistent, + optional_yield y, + const DoutPrefixProvider* dpp) override; virtual RGWAccessControlPolicy& get_acl(void) override { return acls; } virtual int set_acl(const DoutPrefixProvider* dpp, RGWAccessControlPolicy& acl, optional_yield y) override; diff --git a/src/rgw/driver/motr/rgw_sal_motr.cc b/src/rgw/driver/motr/rgw_sal_motr.cc index 1e110ae73a3c6..8cc8df987d2bb 100644 --- a/src/rgw/driver/motr/rgw_sal_motr.cc +++ b/src/rgw/driver/motr/rgw_sal_motr.cc @@ -539,7 +539,7 @@ int MotrUser::verify_mfa(const std::string& mfa_str, bool* verified, const DoutP return 0; } -int MotrBucket::remove_bucket(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) +int MotrBucket::remove(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) { int ret; @@ -669,7 +669,7 @@ int MotrBucket::remove_bucket(const DoutPrefixProvider *dpp, bool delete_childre return ret; } -int MotrBucket::remove_bucket_bypass_gc(int concurrent_max, bool +int MotrBucket::remove_bypass_gc(int concurrent_max, bool keep_index_consistent, optional_yield y, const DoutPrefixProvider *dpp) { diff --git a/src/rgw/driver/motr/rgw_sal_motr.h b/src/rgw/driver/motr/rgw_sal_motr.h index 92ddc9a115f2c..3a110e36f173a 100644 --- a/src/rgw/driver/motr/rgw_sal_motr.h +++ b/src/rgw/driver/motr/rgw_sal_motr.h @@ -352,8 +352,8 @@ class MotrBucket : public StoreBucket { virtual std::unique_ptr get_object(const rgw_obj_key& k) override; virtual int list(const DoutPrefixProvider *dpp, ListParams&, int, ListResults&, optional_yield y) override; - virtual int remove_bucket(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) override; - virtual int remove_bucket_bypass_gc(int concurrent_max, bool + virtual int remove(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) override; + virtual int remove_bypass_gc(int concurrent_max, bool keep_index_consistent, optional_yield y, const DoutPrefixProvider *dpp) override; diff --git a/src/rgw/driver/posix/rgw_sal_posix.cc b/src/rgw/driver/posix/rgw_sal_posix.cc index e4e640b020347..b72c7868600b7 100644 --- a/src/rgw/driver/posix/rgw_sal_posix.cc +++ b/src/rgw/driver/posix/rgw_sal_posix.cc @@ -851,20 +851,20 @@ int POSIXBucket::merge_and_store_attrs(const DoutPrefixProvider* dpp, return write_attrs(dpp, y); } -int POSIXBucket::remove_bucket(const DoutPrefixProvider* dpp, - bool delete_children, - optional_yield y) +int POSIXBucket::remove(const DoutPrefixProvider* dpp, + bool delete_children, + optional_yield y) { return delete_directory(parent_fd, get_fname().c_str(), delete_children, dpp); } -int POSIXBucket::remove_bucket_bypass_gc(int concurrent_max, - bool keep_index_consistent, - optional_yield y, - const DoutPrefixProvider *dpp) +int POSIXBucket::remove_bypass_gc(int concurrent_max, + bool keep_index_consistent, + optional_yield y, + const DoutPrefixProvider *dpp) { - return remove_bucket(dpp, true, y); + return remove(dpp, true, y); } int POSIXBucket::load_bucket(const DoutPrefixProvider* dpp, optional_yield y) @@ -1448,7 +1448,7 @@ int POSIXObject::delete_object(const DoutPrefixProvider* dpp, if (!b->versioned()) { if (shadow) { - ret = shadow->remove_bucket(dpp, true, y); + ret = shadow->remove(dpp, true, y); if (ret < 0) { return ret; } @@ -2587,7 +2587,7 @@ int POSIXMultipartUpload::abort(const DoutPrefixProvider *dpp, CephContext *cct, return ret; } - shadow->remove_bucket(dpp, true, y); + shadow->remove(dpp, true, y); return 0; } diff --git a/src/rgw/driver/posix/rgw_sal_posix.h b/src/rgw/driver/posix/rgw_sal_posix.h index c5360aa90f9a5..16f88729ab4a9 100644 --- a/src/rgw/driver/posix/rgw_sal_posix.h +++ b/src/rgw/driver/posix/rgw_sal_posix.h @@ -175,12 +175,12 @@ public: ListResults&, optional_yield y) override; virtual int merge_and_store_attrs(const DoutPrefixProvider* dpp, Attrs& new_attrs, optional_yield y) override; - virtual int remove_bucket(const DoutPrefixProvider* dpp, bool delete_children, - optional_yield y) override; - virtual int remove_bucket_bypass_gc(int concurrent_max, - bool keep_index_consistent, - optional_yield y, - const DoutPrefixProvider *dpp) override; + virtual int remove(const DoutPrefixProvider* dpp, bool delete_children, + optional_yield y) override; + virtual int remove_bypass_gc(int concurrent_max, + bool keep_index_consistent, + optional_yield y, + const DoutPrefixProvider *dpp) override; virtual int create(const DoutPrefixProvider* dpp, const CreateParams& params, optional_yield y) override; diff --git a/src/rgw/driver/rados/rgw_bucket.cc b/src/rgw/driver/rados/rgw_bucket.cc index d0bdc025b7a64..4af11fc464648 100644 --- a/src/rgw/driver/rados/rgw_bucket.cc +++ b/src/rgw/driver/rados/rgw_bucket.cc @@ -1253,9 +1253,9 @@ int RGWBucketAdminOp::remove_bucket(rgw::sal::Driver* driver, RGWBucketAdminOpSt return ret; if (bypass_gc) - ret = bucket->remove_bucket_bypass_gc(op_state.get_max_aio(), keep_index_consistent, y, dpp); + ret = bucket->remove_bypass_gc(op_state.get_max_aio(), keep_index_consistent, y, dpp); else - ret = bucket->remove_bucket(dpp, op_state.will_delete_children(), y); + ret = bucket->remove(dpp, op_state.will_delete_children(), y); return ret; } diff --git a/src/rgw/driver/rados/rgw_rest_bucket.cc b/src/rgw/driver/rados/rgw_rest_bucket.cc index a530d40567354..4fac8ef64f7c5 100644 --- a/src/rgw/driver/rados/rgw_rest_bucket.cc +++ b/src/rgw/driver/rados/rgw_rest_bucket.cc @@ -243,7 +243,7 @@ void RGWOp_Bucket_Remove::execute(optional_yield y) return; } - op_ret = bucket->remove_bucket(s, delete_children, s->yield); + op_ret = bucket->remove(s, delete_children, s->yield); } class RGWOp_Set_Bucket_Quota : public RGWRESTOp { diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc index f96378ada012a..c555ead9745ec 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.cc +++ b/src/rgw/driver/rados/rgw_sal_rados.cc @@ -271,9 +271,9 @@ int RadosUser::verify_mfa(const std::string& mfa_str, bool* verified, RadosBucket::~RadosBucket() {} -int RadosBucket::remove_bucket(const DoutPrefixProvider* dpp, - bool delete_children, - optional_yield y) +int RadosBucket::remove(const DoutPrefixProvider* dpp, + bool delete_children, + optional_yield y) { int ret; @@ -358,10 +358,10 @@ int RadosBucket::remove_bucket(const DoutPrefixProvider* dpp, return ret; } -int RadosBucket::remove_bucket_bypass_gc(int concurrent_max, bool - keep_index_consistent, - optional_yield y, const - DoutPrefixProvider *dpp) +int RadosBucket::remove_bypass_gc(int concurrent_max, bool + keep_index_consistent, + optional_yield y, const + DoutPrefixProvider *dpp) { int ret; map stats; @@ -485,7 +485,7 @@ int RadosBucket::remove_bucket_bypass_gc(int concurrent_max, bool // this function can only be run if caller wanted children to be // deleted, so we can ignore the check for children as any that // remain are detritus from a prior bug - ret = remove_bucket(dpp, true, y); + ret = remove(dpp, true, y); if (ret < 0) { ldpp_dout(dpp, -1) << "ERROR: could not remove bucket " << this << dendl; return ret; diff --git a/src/rgw/driver/rados/rgw_sal_rados.h b/src/rgw/driver/rados/rgw_sal_rados.h index 0ad6e8fa083ab..c67d23289ed28 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.h +++ b/src/rgw/driver/rados/rgw_sal_rados.h @@ -512,11 +512,11 @@ class RadosBucket : public StoreBucket { virtual ~RadosBucket(); virtual std::unique_ptr get_object(const rgw_obj_key& k) override; virtual int list(const DoutPrefixProvider* dpp, ListParams&, int, ListResults&, optional_yield y) override; - virtual int remove_bucket(const DoutPrefixProvider* dpp, bool delete_children, optional_yield y) override; - virtual int remove_bucket_bypass_gc(int concurrent_max, bool - keep_index_consistent, - optional_yield y, const - DoutPrefixProvider *dpp) override; + virtual int remove(const DoutPrefixProvider* dpp, bool delete_children, optional_yield y) override; + virtual int remove_bypass_gc(int concurrent_max, bool + keep_index_consistent, + optional_yield y, const + DoutPrefixProvider *dpp) override; virtual RGWAccessControlPolicy& get_acl(void) override { return acls; } virtual int set_acl(const DoutPrefixProvider* dpp, RGWAccessControlPolicy& acl, optional_yield y) override; int create(const DoutPrefixProvider* dpp, const CreateParams& params, diff --git a/src/rgw/driver/rados/rgw_user.cc b/src/rgw/driver/rados/rgw_user.cc index 97776f9d5a21f..c27be158c3347 100644 --- a/src/rgw/driver/rados/rgw_user.cc +++ b/src/rgw/driver/rados/rgw_user.cc @@ -1791,7 +1791,7 @@ int RGWUser::execute_remove(const DoutPrefixProvider *dpp, RGWUserAdminOpState& return ret; } - ret = bucket->remove_bucket(dpp, true, y); + ret = bucket->remove(dpp, true, y); if (ret < 0) { set_err_msg(err_msg, "unable to delete user data"); return ret; diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 1fbd2ec7105a5..00715db9219d1 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -3730,7 +3730,7 @@ void RGWDeleteBucket::execute(optional_yield y) // do nothing; it will already have been logged } - op_ret = s->bucket->remove_bucket(this, false, y); + op_ret = s->bucket->remove(this, false, y); if (op_ret < 0 && op_ret == -ECANCELED) { // lost a race, either with mdlog sync or another delete bucket operation. // in either case, we've already called ctl.bucket->unlink_bucket() @@ -7478,7 +7478,7 @@ bool RGWBulkDelete::Deleter::delete_single(const acct_path_t& path, optional_yie goto delop_fail; } } - ret = bucket->remove_bucket(dpp, false, s->yield); + ret = bucket->remove(dpp, false, s->yield); if (ret < 0) { goto delop_fail; } diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index 1019f48dab464..b222fcd03cbc9 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -636,12 +636,12 @@ class Bucket { /** Set the cached attributes on this bucket */ virtual int set_attrs(Attrs a) = 0; /** Remove this bucket from the backing store */ - virtual int remove_bucket(const DoutPrefixProvider* dpp, bool delete_children, optional_yield y) = 0; + virtual int remove(const DoutPrefixProvider* dpp, bool delete_children, optional_yield y) = 0; /** Remove this bucket, bypassing garbage collection. May be removed */ - virtual int remove_bucket_bypass_gc(int concurrent_max, bool - keep_index_consistent, - optional_yield y, const - DoutPrefixProvider *dpp) = 0; + virtual int remove_bypass_gc(int concurrent_max, bool + keep_index_consistent, + optional_yield y, const + DoutPrefixProvider *dpp) = 0; /** Get then ACL for this bucket */ virtual RGWAccessControlPolicy& get_acl(void) = 0; /** Set the ACL for this bucket */ diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc index bce27b912d8f8..5140a3bfbe8e7 100644 --- a/src/rgw/rgw_sal_dbstore.cc +++ b/src/rgw/rgw_sal_dbstore.cc @@ -155,7 +155,7 @@ namespace rgw::sal { return 0; } - int DBBucket::remove_bucket(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) + int DBBucket::remove(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) { int ret; @@ -196,10 +196,10 @@ namespace rgw::sal { return ret; } - int DBBucket::remove_bucket_bypass_gc(int concurrent_max, bool - keep_index_consistent, - optional_yield y, const - DoutPrefixProvider *dpp) { + int DBBucket::remove_bypass_gc(int concurrent_max, bool + keep_index_consistent, + optional_yield y, const + DoutPrefixProvider *dpp) { return 0; } diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index bd359d038a280..26a8dfbcafddf 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -155,11 +155,11 @@ protected: virtual std::unique_ptr get_object(const rgw_obj_key& k) override; virtual int list(const DoutPrefixProvider *dpp, ListParams&, int, ListResults&, optional_yield y) override; - virtual int remove_bucket(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) override; - virtual int remove_bucket_bypass_gc(int concurrent_max, bool - keep_index_consistent, - optional_yield y, const - DoutPrefixProvider *dpp) override; + virtual int remove(const DoutPrefixProvider *dpp, bool delete_children, optional_yield y) override; + virtual int remove_bypass_gc(int concurrent_max, bool + keep_index_consistent, + optional_yield y, const + DoutPrefixProvider *dpp) override; virtual RGWAccessControlPolicy& get_acl(void) override { return acls; } virtual int set_acl(const DoutPrefixProvider *dpp, RGWAccessControlPolicy& acl, optional_yield y) override; int create(const DoutPrefixProvider* dpp, diff --git a/src/rgw/rgw_sal_filter.cc b/src/rgw/rgw_sal_filter.cc index b27f1123995e0..f3ee09fe0c988 100644 --- a/src/rgw/rgw_sal_filter.cc +++ b/src/rgw/rgw_sal_filter.cc @@ -566,19 +566,19 @@ int FilterBucket::list(const DoutPrefixProvider* dpp, ListParams& params, int ma return next->list(dpp, params, max, results, y); } -int FilterBucket::remove_bucket(const DoutPrefixProvider* dpp, - bool delete_children, - optional_yield y) +int FilterBucket::remove(const DoutPrefixProvider* dpp, + bool delete_children, + optional_yield y) { - return next->remove_bucket(dpp, delete_children, y); + return next->remove(dpp, delete_children, y); } -int FilterBucket::remove_bucket_bypass_gc(int concurrent_max, - bool keep_index_consistent, - optional_yield y, - const DoutPrefixProvider *dpp) +int FilterBucket::remove_bypass_gc(int concurrent_max, + bool keep_index_consistent, + optional_yield y, + const DoutPrefixProvider *dpp) { - return next->remove_bucket_bypass_gc(concurrent_max, keep_index_consistent, y, dpp); + return next->remove_bypass_gc(concurrent_max, keep_index_consistent, y, dpp); } int FilterBucket::set_acl(const DoutPrefixProvider* dpp, diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h index 8ca3a470e448b..34739c3426a25 100644 --- a/src/rgw/rgw_sal_filter.h +++ b/src/rgw/rgw_sal_filter.h @@ -379,12 +379,12 @@ public: ListResults&, optional_yield y) override; virtual Attrs& get_attrs(void) override { return next->get_attrs(); } virtual int set_attrs(Attrs a) override { return next->set_attrs(a); } - virtual int remove_bucket(const DoutPrefixProvider* dpp, bool delete_children, - optional_yield y) override; - virtual int remove_bucket_bypass_gc(int concurrent_max, bool - keep_index_consistent, - optional_yield y, const - DoutPrefixProvider *dpp) override; + virtual int remove(const DoutPrefixProvider* dpp, bool delete_children, + optional_yield y) override; + virtual int remove_bypass_gc(int concurrent_max, bool + keep_index_consistent, + optional_yield y, const + DoutPrefixProvider *dpp) override; virtual RGWAccessControlPolicy& get_acl(void) override { return next->get_acl(); } virtual int set_acl(const DoutPrefixProvider* dpp, RGWAccessControlPolicy& acl, optional_yield y) override; -- 2.39.5