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: v19.1.0~482^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a15b7d1cc5197f778d2fe0f4a8c2fb2be6cd9435;p=ceph.git rgw/lc: remove default arguments in virtual functions Signed-off-by: Juan Zhu --- diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.cc b/src/rgw/driver/d4n/rgw_sal_d4n.cc index b10dd760d78a3..8647519855d37 100644 --- a/src/rgw/driver/d4n/rgw_sal_d4n.cc +++ b/src/rgw/driver/d4n/rgw_sal_d4n.cc @@ -379,7 +379,7 @@ int D4NFilterObject::D4NFilterDeleteOp::delete_obj(const DoutPrefixProvider* dpp ldpp_dout(dpp, 20) << "D4N Filter: Cache delete operation succeeded." << dendl; } - return next->delete_obj(dpp, y); + return next->delete_obj(dpp, y, log_op); } int D4NFilterWriter::prepare(optional_yield y) diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.h b/src/rgw/driver/d4n/rgw_sal_d4n.h index 95696efc543e0..d6ab2f7351bf1 100644 --- a/src/rgw/driver/d4n/rgw_sal_d4n.h +++ b/src/rgw/driver/d4n/rgw_sal_d4n.h @@ -111,7 +111,7 @@ class D4NFilterObject : public FilterObject { source(_source) {} virtual ~D4NFilterDeleteOp() = 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; }; D4NFilterObject(std::unique_ptr _next, D4NFilterDriver* _filter) : FilterObject(std::move(_next)), @@ -178,7 +178,7 @@ class D4NFilterWriter : public FilterWriter { const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; bool is_atomic() { return atomic; }; const DoutPrefixProvider* dpp() { return save_dpp; } }; diff --git a/src/rgw/driver/daos/rgw_sal_daos.h b/src/rgw/driver/daos/rgw_sal_daos.h index 3b067bcdffbd6..db024169a8c91 100644 --- a/src/rgw/driver/daos/rgw_sal_daos.h +++ b/src/rgw/driver/daos/rgw_sal_daos.h @@ -581,7 +581,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; @@ -642,7 +642,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, @@ -747,7 +747,7 @@ class DaosAtomicWriter : public StoreWriter { const char* if_nomatch, const std::string* user_data, rgw_zone_set* zones_trace, bool* canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; }; class DaosMultipartWriter : public StoreWriter { @@ -793,7 +793,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(); }; @@ -849,7 +849,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/driver/motr/rgw_sal_motr.h b/src/rgw/driver/motr/rgw_sal_motr.h index a6f0964242218..c15212415d805 100644 --- a/src/rgw/driver/motr/rgw_sal_motr.h +++ b/src/rgw/driver/motr/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; @@ -711,7 +711,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; @@ -814,7 +814,7 @@ class MotrAtomicWriter : public StoreWriter { const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; unsigned populate_bvec(unsigned len, bufferlist::iterator &bi); void cleanup(); @@ -862,7 +862,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 @@ -937,7 +937,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, 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, diff --git a/src/rgw/driver/posix/rgw_sal_posix.h b/src/rgw/driver/posix/rgw_sal_posix.h index 67931a4677a4d..42c46242640c4 100644 --- a/src/rgw/driver/posix/rgw_sal_posix.h +++ b/src/rgw/driver/posix/rgw_sal_posix.h @@ -298,7 +298,7 @@ public: source(_source) {} virtual ~POSIXDeleteOp() = 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; }; POSIXObject(POSIXDriver *_dr, const rgw_obj_key& _k) @@ -356,7 +356,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, @@ -545,7 +545,7 @@ public: int num_parts, int marker, int* next_marker, bool* truncated, optional_yield y, 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, @@ -608,7 +608,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; }; class POSIXMultipartWriter : public StoreWriter { @@ -648,7 +648,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; }; diff --git a/src/rgw/driver/rados/rgw_cr_rados.cc b/src/rgw/driver/rados/rgw_cr_rados.cc index 2a4a02f29adc5..b7d362423e53b 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 b2ffef0589fa0..a8ecb4bfa099b 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -5653,7 +5653,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 e6dc69e4c088d..e5ac7229bf6c5 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.cc +++ b/src/rgw/driver/rados/rgw_sal_rados.cc @@ -811,7 +811,7 @@ int RadosBucket::abort_multiparts(const DoutPrefixProvider* dpp, if (!uploads.empty()) { for (const auto& upload : uploads) { - ret = upload->abort(dpp, cct, y); + ret = upload->abort(dpp, cct, y, 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 efd36be19e97c..a05403856111b 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.h +++ b/src/rgw/driver/rados/rgw_sal_rados.h @@ -332,7 +332,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) @@ -414,7 +414,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, @@ -610,7 +610,7 @@ public: int num_parts, int marker, int* next_marker, bool* truncated, optional_yield y, 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, @@ -754,7 +754,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; }; class RadosAppendWriter : public StoreWriter { @@ -802,7 +802,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; }; class RadosMultipartWriter : public StoreWriter { @@ -848,7 +848,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - 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 f0100e37c2bbe..f69ba543d898d 100644 --- a/src/rgw/rgw_file.cc +++ b/src/rgw/rgw_file.cc @@ -2020,7 +2020,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, - rctx); + rctx, 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 521630e05b0f7..12fc4a706d9c1 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -4530,7 +4530,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, - rctx); + rctx, true); tracepoint(rgw_op, processor_complete_exit, s->req_id.c_str()); // send request to notification manager @@ -4799,7 +4799,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, - rctx); + rctx, true); if (op_ret < 0) { return; } @@ -5357,7 +5357,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; @@ -6896,7 +6896,7 @@ void RGWAbortMultipart::execute(optional_yield y) } multipart_trace = tracing::rgw::tracer.add_span(name(), trace_ctx); - op_ret = upload->abort(this, s->cct, y); + op_ret = upload->abort(this, s->cct, y, true); } int RGWListMultipart::verify_permission(optional_yield y) @@ -7262,7 +7262,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; } @@ -7436,7 +7436,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; } @@ -7949,7 +7949,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, - rctx); + rctx, 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 218aad8884b1f..33891d08a4c10 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -225,7 +225,7 @@ class ObjectProcessor : public DataProcessor { const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) = 0; + bool log_op) = 0; }; /** A list of key-value attributes */ @@ -888,7 +888,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() {} @@ -966,7 +966,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, @@ -1145,7 +1145,7 @@ public: int* next_marker, bool* truncated, optional_yield y, bool assume_unsorted = false) = 0; /** Abort this upload */ - virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, optional_yield y, bool log_op = true) = 0; + virtual int abort(const DoutPrefixProvider* dpp, CephContext* cct, optional_yield y, 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, @@ -1375,7 +1375,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) = 0; + bool log_op) = 0; }; diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index 0da065e4a8f52..d39fb3f62550b 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -462,7 +462,7 @@ protected: int num_parts, int marker, int* next_marker, bool* truncated, optional_yield y, 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, @@ -524,7 +524,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; @@ -580,7 +580,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; @@ -657,7 +657,7 @@ protected: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; }; class DBMultipartWriter : public StoreWriter { @@ -706,7 +706,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - 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 ebb72e2123666..953cf54e04088 100644 --- a/src/rgw/rgw_sal_filter.cc +++ b/src/rgw/rgw_sal_filter.cc @@ -1027,7 +1027,7 @@ int FilterMultipartUpload::list_parts(const DoutPrefixProvider *dpp, CephContext int FilterMultipartUpload::abort(const DoutPrefixProvider *dpp, CephContext *cct, optional_yield y, bool log_op) { - return next->abort(dpp, cct, y); + return next->abort(dpp, cct, y, 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 ff1c346950ae7..d258cda4a654f 100644 --- a/src/rgw/rgw_sal_filter.h +++ b/src/rgw/rgw_sal_filter.h @@ -521,7 +521,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)) {} @@ -584,7 +584,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, @@ -697,7 +697,7 @@ public: int num_parts, int marker, int* next_marker, bool* truncated, optional_yield y, 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, @@ -842,7 +842,7 @@ public: const std::string *user_data, rgw_zone_set *zones_trace, bool *canceled, const req_context& rctx, - bool log_op = true) override; + bool log_op) override; }; class FilterLuaManager : public LuaManager { diff --git a/src/test/rgw/test_d4n_filter.cc b/src/test/rgw/test_d4n_filter.cc index 4f54d9b86bb03..b1483f26e0db3 100644 --- a/src/test/rgw/test_d4n_filter.cc +++ b/src/test/rgw/test_d4n_filter.cc @@ -169,7 +169,7 @@ class D4NFilterFixture : public ::testing::Test { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx); + rctx, true); return ret; } @@ -429,7 +429,7 @@ TEST_F(D4NFilterFixture, CopyObjectReplace) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx), 0); + rctx, true), 0); unique_ptr testObject_copy = testBucket->get_object(rgw_obj_key("test_object_copy")); @@ -554,7 +554,7 @@ TEST_F(D4NFilterFixture, CopyObjectMerge) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx), 0); + rctx, true), 0); unique_ptr testObject_copy = testBucket->get_object(rgw_obj_key("test_object_copy")); @@ -639,7 +639,7 @@ TEST_F(D4NFilterFixture, DelObject) { unique_ptr testDOp = testObject_DelObject->get_delete_op(); EXPECT_NE(testDOp, nullptr); - EXPECT_EQ(testDOp->delete_obj(dpp, null_yield), 0); + EXPECT_EQ(testDOp->delete_obj(dpp, null_yield, true), 0); /* Check the object does not exist after delete op */ client.exists(keys, [](cpp_redis::reply& reply) { @@ -1881,7 +1881,7 @@ TEST_F(D4NFilterFixture, DataCheck) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx), 0); + rctx, true), 0); client.hget("rgw-object:test_object_DataCheck:cache", "data", [&data](cpp_redis::reply& reply) { if (reply.is_string()) { @@ -1906,7 +1906,7 @@ TEST_F(D4NFilterFixture, DataCheck) { &if_match, &if_nomatch, &user_data, &zones_trace, &canceled, - rctx), 0); + rctx, true), 0); client.hget("rgw-object:test_object_DataCheck:cache", "data", [&dataNew](cpp_redis::reply& reply) { if (reply.is_string()) {