From 45c35d5a956861ba7347856ceeebe47a20f9d2ee Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 10 Apr 2024 10:46:58 -0400 Subject: [PATCH] rgw/d4n: object attrs shouldn't store/update user metadata Signed-off-by: Casey Bodley --- src/rgw/driver/d4n/rgw_sal_d4n.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.cc b/src/rgw/driver/d4n/rgw_sal_d4n.cc index 1e297b01e61..a93bd5b53e6 100644 --- a/src/rgw/driver/d4n/rgw_sal_d4n.cc +++ b/src/rgw/driver/d4n/rgw_sal_d4n.cc @@ -255,7 +255,6 @@ int D4NFilterObject::get_obj_attrs(optional_yield y, const DoutPrefixProvider* d /* Set metadata locally */ RGWQuotaInfo quota_info; RGWObjState* astate; - std::unique_ptr user = this->driver->get_user(this->get_bucket()->get_owner()); this->get_obj_state(dpp, &astate, y); for (auto it = attrs.begin(); it != attrs.end(); ++it) { @@ -285,7 +284,6 @@ int D4NFilterObject::get_obj_attrs(optional_yield y, const DoutPrefixProvider* d quota_info.max_objects = std::stoull(it->second.c_str()); attrs.erase(it->first); } else if (it->first == "max_buckets") { - user->set_max_buckets(std::stoull(it->second.c_str())); attrs.erase(it->first); } else { ldpp_dout(dpp, 20) << "D4N Filter: Unexpected attribute; not locally set." << dendl; @@ -294,7 +292,6 @@ int D4NFilterObject::get_obj_attrs(optional_yield y, const DoutPrefixProvider* d } } - user->set_info(quota_info); this->set_obj_state(*astate); /* Set attributes locally */ @@ -394,7 +391,6 @@ int D4NFilterObject::D4NFilterReadOp::prepare(optional_yield y, const DoutPrefix /* Set metadata locally */ RGWObjState* astate; RGWQuotaInfo quota_info; - std::unique_ptr user = source->driver->get_user(source->get_bucket()->get_owner()); source->get_obj_state(dpp, &astate, y); for (auto& attr : attrs) { @@ -424,13 +420,11 @@ int D4NFilterObject::D4NFilterReadOp::prepare(optional_yield y, const DoutPrefix quota_info.max_objects = std::stoull(attr.second.c_str()); attrs.erase(attr.first); } else if (attr.first == "max_buckets") { - user->set_max_buckets(std::stoull(attr.second.c_str())); attrs.erase(attr.first); } else { ldpp_dout(dpp, 20) << "D4NFilterObject::D4NFilterReadOp::" << __func__ << "(): Unexpected attribute; not locally set." << dendl; } } - user->set_info(quota_info); source->set_obj_state(*astate); /* Set attributes locally */ -- 2.39.5