From: Jane Zhu Date: Thu, 7 Dec 2023 18:02:28 +0000 (-0500) Subject: rgw/lc: remove default arguments in virtual functions X-Git-Tag: v18.2.4~208^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70c19ea38bafccee2cc0c1184e16ad3bc34a35a0;p=ceph.git rgw/lc: remove default arguments in virtual functions Signed-off-by: Juan Zhu (cherry picked from commit a15b7d1cc5197f778d2fe0f4a8c2fb2be6cd9435) Conflicts: src/rgw/driver/d4n/rgw_sal_d4n.cc src/rgw/driver/d4n/rgw_sal_d4n.h src/rgw/driver/posix/rgw_sal_posix.h src/rgw/driver/rados/rgw_sal_rados.cc src/rgw/driver/rados/rgw_sal_rados.h src/rgw/rgw_file.cc src/rgw/rgw_op.cc src/rgw/rgw_sal.h src/rgw/rgw_sal_daos.h src/rgw/rgw_sal_dbstore.h src/rgw/rgw_sal_filter.cc src/rgw/rgw_sal_filter.h src/rgw/rgw_sal_motr.h src/test/rgw/test_d4n_filter.cc --- diff --git a/src/rgw/driver/rados/rgw_cr_rados.cc b/src/rgw/driver/rados/rgw_cr_rados.cc index d8e0ecba63e1..996a3758f117 100644 --- a/src/rgw/driver/rados/rgw_cr_rados.cc +++ b/src/rgw/driver/rados/rgw_cr_rados.cc @@ -922,7 +922,7 @@ int RGWAsyncRemoveObj::_send_request(const DoutPrefixProvider *dpp) del_op->params.high_precision_time = true; del_op->params.zones_trace = &zones_trace; - ret = del_op->delete_obj(dpp, null_yield); + ret = del_op->delete_obj(dpp, null_yield, true); if (ret < 0) { ldpp_dout(dpp, 20) << __func__ << "(): delete_obj() obj=" << obj << " returned ret=" << ret << dendl; } diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index b9d5e648e0e1..a8543cb5d2d7 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -5405,7 +5405,7 @@ int RGWRados::Object::Delete::delete_obj(optional_yield y, const DoutPrefixProvi } result.delete_marker = dirent.is_delete_marker(); r = store->unlink_obj_instance(dpp, target->get_ctx(), target->get_bucket_info(), obj, params.olh_epoch, - y, params.zones_trace, log_op); + y, params.zones_trace, add_log); if (r < 0) { return r; } diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc index b4ad57708180..2c369604a6a3 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.cc +++ b/src/rgw/driver/rados/rgw_sal_rados.cc @@ -1002,7 +1002,7 @@ int RadosBucket::abort_multiparts(const DoutPrefixProvider* dpp, if (!uploads.empty()) { for (const auto& upload : uploads) { - ret = upload->abort(dpp, cct); + ret = upload->abort(dpp, cct, true); if (ret < 0) { // we're doing a best-effort; if something cannot be found, // log it and keep moving forward diff --git a/src/rgw/driver/rados/rgw_sal_rados.h b/src/rgw/driver/rados/rgw_sal_rados.h index 141ce99b25dd..5d83bb0432b2 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.h +++ b/src/rgw/driver/rados/rgw_sal_rados.h @@ -370,7 +370,7 @@ class RadosObject : public StoreObject { public: RadosDeleteOp(RadosObject* _source); - virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op = true) override; + virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op) override; }; RadosObject(RadosStore *_st, const rgw_obj_key& _k) @@ -454,7 +454,7 @@ class RadosObject : public StoreObject { uint64_t olh_epoch, const DoutPrefixProvider* dpp, optional_yield y, - bool log_op = true) override; + bool log_op) override; virtual int transition_to_cloud(Bucket* bucket, rgw::sal::PlacementTier* tier, rgw_bucket_dir_entry& o, @@ -680,7 +680,7 @@ public: int num_parts, int marker, int* next_marker, bool* truncated, bool assume_unsorted = false) override; - virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op = true) override; + virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op) override; virtual int complete(const DoutPrefixProvider* dpp, optional_yield y, CephContext* cct, std::map& part_etags, @@ -824,7 +824,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; class RadosAppendWriter : public StoreWriter { @@ -872,7 +872,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; class RadosMultipartWriter : public StoreWriter { @@ -918,7 +918,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; class RadosLuaManager : public StoreLuaManager { diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc index ee32170a1161..1eff7a7d4472 100644 --- a/src/rgw/rgw_file.cc +++ b/src/rgw/rgw_file.cc @@ -2012,7 +2012,7 @@ namespace rgw { op_ret = processor->complete(state->obj_size, etag, &mtime, real_time(), attrs, (delete_at ? *delete_at : real_time()), if_match, if_nomatch, nullptr, nullptr, nullptr, - state->yield); + state->yield, true); if (op_ret != 0) { /* revert attr updates */ rgw_fh->set_mtime(omtime); diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 88388d42e482..ecfa18e10c7b 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -4361,7 +4361,7 @@ void RGWPutObj::execute(optional_yield y) op_ret = processor->complete(s->obj_size, etag, &mtime, real_time(), attrs, (delete_at ? *delete_at : real_time()), if_match, if_nomatch, (user_data.empty() ? nullptr : &user_data), nullptr, nullptr, - s->yield); + s->yield, true); tracepoint(rgw_op, processor_complete_exit, s->req_id.c_str()); /* produce torrent */ @@ -4639,7 +4639,7 @@ void RGWPostObj::execute(optional_yield y) op_ret = processor->complete(s->obj_size, etag, nullptr, real_time(), attrs, (delete_at ? *delete_at : real_time()), nullptr, nullptr, nullptr, nullptr, nullptr, - s->yield); + s->yield, true); if (op_ret < 0) { return; } @@ -5202,7 +5202,7 @@ void RGWDeleteObj::execute(optional_yield y) del_op->params.olh_epoch = epoch; del_op->params.marker_version_id = version_id; - op_ret = del_op->delete_obj(this, y); + op_ret = del_op->delete_obj(this, y, true); if (op_ret >= 0) { delete_marker = del_op->result.delete_marker; version_id = del_op->result.version_id; @@ -6733,7 +6733,7 @@ void RGWAbortMultipart::execute(optional_yield y) } multipart_trace = tracing::rgw::tracer.add_span(name(), trace_ctx); - op_ret = upload->abort(this, s->cct); + op_ret = upload->abort(this, s->cct, true); } int RGWListMultipart::verify_permission(optional_yield y) @@ -7099,7 +7099,7 @@ void RGWDeleteMultiObj::handle_individual_object(const rgw_obj_key& o, optional_ del_op->params.bucket_owner = s->bucket_owner; del_op->params.marker_version_id = version_id; - op_ret = del_op->delete_obj(this, y); + op_ret = del_op->delete_obj(this, y, true); if (op_ret == -ENOENT) { op_ret = 0; } @@ -7275,7 +7275,7 @@ bool RGWBulkDelete::Deleter::delete_single(const acct_path_t& path, optional_yie del_op->params.obj_owner = bowner; del_op->params.bucket_owner = bucket_owner; - ret = del_op->delete_obj(dpp, y); + ret = del_op->delete_obj(dpp, y, true); if (ret < 0) { goto delop_fail; } @@ -7765,7 +7765,7 @@ int RGWBulkUploadOp::handle_file(const std::string_view path, op_ret = processor->complete(size, etag, nullptr, ceph::real_time(), attrs, ceph::real_time() /* delete_at */, nullptr, nullptr, nullptr, nullptr, nullptr, - s->yield); + s->yield, true); if (op_ret < 0) { ldpp_dout(this, 20) << "processor::complete returned op_ret=" << op_ret << dendl; } diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index b2b46e76b8cd..fba422e618f7 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -244,7 +244,7 @@ class ObjectProcessor : public DataProcessor { const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) = 0; + bool log_op) = 0; }; /** Base class for AIO completions */ @@ -948,7 +948,7 @@ class Object { virtual ~DeleteOp() = default; /** Delete the object */ - virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op = true) = 0; + virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op) = 0; }; Object() {} @@ -1027,7 +1027,7 @@ class Object { uint64_t olh_epoch, const DoutPrefixProvider* dpp, optional_yield y, - bool log_op = true) = 0; + bool log_op) = 0; /** Move an object to the cloud */ virtual int transition_to_cloud(Bucket* bucket, rgw::sal::PlacementTier* tier, @@ -1209,7 +1209,7 @@ public: int* next_marker, bool* truncated, bool assume_unsorted = false) = 0; /** Abort this upload */ - virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op = true) = 0; + virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op) = 0; /** Complete this upload, making it available as a normal object */ virtual int complete(const DoutPrefixProvider* dpp, optional_yield y, CephContext* cct, @@ -1439,7 +1439,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) = 0; + bool log_op) = 0; }; diff --git a/src/rgw/rgw_sal_daos.h b/src/rgw/rgw_sal_daos.h index 5d8181f48c6b..3500d9f47cd1 100644 --- a/src/rgw/rgw_sal_daos.h +++ b/src/rgw/rgw_sal_daos.h @@ -589,7 +589,7 @@ class DaosObject : public StoreObject { DaosDeleteOp(DaosObject* _source); virtual int delete_obj(const DoutPrefixProvider* dpp, - optional_yield y, bool log_op = true) override; + optional_yield y, bool log_op) override; }; ds3_obj_t* ds3o = nullptr; @@ -653,7 +653,7 @@ class DaosObject : public StoreObject { const real_time& mtime, uint64_t olh_epoch, const DoutPrefixProvider* dpp, optional_yield y, - bool log_op = true) override; + bool log_op) override; virtual int transition_to_cloud(Bucket* bucket, rgw::sal::PlacementTier* tier, rgw_bucket_dir_entry& o, std::set& cloud_targets, @@ -765,7 +765,7 @@ class DaosAtomicWriter : public StoreWriter { const char* if_nomatch, const std::string* user_data, rgw_zone_set* zones_trace, bool* canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; class DaosMultipartWriter : public StoreWriter { @@ -811,7 +811,7 @@ class DaosMultipartWriter : public StoreWriter { const char* if_nomatch, const std::string* user_data, rgw_zone_set* zones_trace, bool* canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; const std::string& get_bucket_name(); }; @@ -867,7 +867,7 @@ class DaosMultipartUpload : public StoreMultipartUpload { int num_parts, int marker, int* next_marker, bool* truncated, bool assume_unsorted = false) override; - virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, optional_yield y, bool log_op = true) override; + virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, optional_yield y, bool log_op) override; virtual int complete(const DoutPrefixProvider* dpp, optional_yield y, CephContext* cct, std::map& part_etags, std::list& remove_objs, diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index d8138e148aac..1595b1532310 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -505,7 +505,7 @@ protected: int num_parts, int marker, int* next_marker, bool* truncated, bool assume_unsorted = false) override; - virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op = true) override; + virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op) override; virtual int complete(const DoutPrefixProvider* dpp, optional_yield y, CephContext* cct, std::map& part_etags, @@ -567,7 +567,7 @@ protected: public: DBDeleteOp(DBObject* _source); - virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op = true) override; + virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op) override; }; DBObject() = default; @@ -625,7 +625,7 @@ protected: uint64_t olh_epoch, const DoutPrefixProvider* dpp, optional_yield y, - bool log_op = true) override; + bool log_op) override; virtual bool placement_rules_match(rgw_placement_rule& r1, rgw_placement_rule& r2) override; virtual int dump_obj_layout(const DoutPrefixProvider *dpp, optional_yield y, Formatter* f) override; @@ -707,7 +707,7 @@ protected: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; class DBMultipartWriter : public StoreWriter { @@ -756,7 +756,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; class DBStore : public StoreDriver { diff --git a/src/rgw/rgw_sal_filter.cc b/src/rgw/rgw_sal_filter.cc index b5e3586c8a45..287e2a1a5a61 100644 --- a/src/rgw/rgw_sal_filter.cc +++ b/src/rgw/rgw_sal_filter.cc @@ -1139,7 +1139,7 @@ int FilterMultipartUpload::list_parts(const DoutPrefixProvider *dpp, CephContext int FilterMultipartUpload::abort(const DoutPrefixProvider *dpp, CephContext *cct, bool log_op) { - return next->abort(dpp, cct); + return next->abort(dpp, cct, log_op); } int FilterMultipartUpload::complete(const DoutPrefixProvider *dpp, diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h index b6f801b42539..9336084a4e07 100644 --- a/src/rgw/rgw_sal_filter.h +++ b/src/rgw/rgw_sal_filter.h @@ -575,7 +575,7 @@ public: FilterDeleteOp(std::unique_ptr _next) : next(std::move(_next)) {} virtual ~FilterDeleteOp() = default; - virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op = true) override; + virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op) override; }; FilterObject(std::unique_ptr _next) : next(std::move(_next)) {} @@ -640,7 +640,7 @@ public: uint64_t olh_epoch, const DoutPrefixProvider* dpp, optional_yield y, - bool log_op = true) override; + bool log_op) override; virtual int transition_to_cloud(Bucket* bucket, rgw::sal::PlacementTier* tier, rgw_bucket_dir_entry& o, @@ -756,7 +756,7 @@ public: int num_parts, int marker, int* next_marker, bool* truncated, bool assume_unsorted = false) override; - virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op = true) override; + virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op) override; virtual int complete(const DoutPrefixProvider* dpp, optional_yield y, CephContext* cct, std::map& part_etags, @@ -901,7 +901,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; class FilterLuaManager : public LuaManager { diff --git a/src/rgw/rgw_sal_motr.h b/src/rgw/rgw_sal_motr.h index 2205df20e174..b92b724839a8 100644 --- a/src/rgw/rgw_sal_motr.h +++ b/src/rgw/rgw_sal_motr.h @@ -660,7 +660,7 @@ class MotrObject : public StoreObject { public: MotrDeleteOp(MotrObject* _source); - virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op = true) override; + virtual int delete_obj(const DoutPrefixProvider* dpp, optional_yield y, bool log_op) override; }; MotrObject() = default; @@ -713,7 +713,7 @@ class MotrObject : public StoreObject { uint64_t olh_epoch, const DoutPrefixProvider* dpp, optional_yield y, - bool log_op = true) override; + bool log_op) override; virtual bool placement_rules_match(rgw_placement_rule& r1, rgw_placement_rule& r2) override; virtual int dump_obj_layout(const DoutPrefixProvider *dpp, optional_yield y, Formatter* f) override; @@ -821,7 +821,7 @@ class MotrAtomicWriter : public StoreWriter { const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; unsigned populate_bvec(unsigned len, bufferlist::iterator &bi); void cleanup(); @@ -869,7 +869,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, optional_yield y, - bool log_op = true) override; + bool log_op) override; }; // The implementation of multipart upload in POC roughly follows the @@ -944,7 +944,7 @@ public: int num_parts, int marker, int* next_marker, bool* truncated, bool assume_unsorted = false) override; - virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op = true) override; + virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, bool log_op) override; virtual int complete(const DoutPrefixProvider* dpp, optional_yield y, CephContext* cct, std::map& part_etags,