From 4817bcaf9d385cb60ef36373ac0262e466953994 Mon Sep 17 00:00:00 2001 From: Huber-ming Date: Fri, 22 Jul 2022 14:18:13 +0800 Subject: [PATCH] rgw: 'bucket check' deletes index of multipart meta when its pending_map is noempty Signed-off-by: Huber-ming (cherry picked from commit 67fc2bd386fe6224b2abd92a0b043ccfcca50ae7) Conflicts: - path: src/rgw/rgw_rados.cc comment: manually resolve conflicts --- src/rgw/rgw_rados.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 4b1cb1c45e2a..6555c2f63703 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -9159,6 +9159,11 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp, std::string loc; rgw_obj obj(bucket, list_state.key); + MultipartMetaFilter multipart_meta_filter; + string temp_key; + if (multipart_meta_filter.filter(list_state.key.name, temp_key)) { + obj.set_in_extra_data(true); + } string oid; get_obj_bucket_and_oid_loc(obj, oid, loc); -- 2.47.3