From: Cory Snyder Date: Fri, 22 Sep 2023 08:35:16 +0000 (+0000) Subject: rgw: radosgw-admin bucket check should only print index entries with --check-objects... X-Git-Tag: v19.0.0~434^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6b057fe55413c0eaf9959f006584cba6cc4c192a;p=ceph-ci.git rgw: radosgw-admin bucket check should only print index entries with --check-objects flag Printing all index entries can be very time consuming for large buckets and the inability to switch this behavior off makes it cumbersome to use the command for fixing bucket stats. This was also preventing the command from outputting recalculated bucket stats when the --fix flag wasn't specified. Signed-off-by: Cory Snyder --- diff --git a/src/rgw/driver/rados/rgw_bucket.cc b/src/rgw/driver/rados/rgw_bucket.cc index 707d64391e3..bddbfeced1e 100644 --- a/src/rgw/driver/rados/rgw_bucket.cc +++ b/src/rgw/driver/rados/rgw_bucket.cc @@ -1227,9 +1227,11 @@ int RGWBucketAdminOp::check_index(rgw::sal::Driver* driver, RGWBucketAdminOpStat if (ret < 0) return ret; - ret = bucket.check_object_index(dpp, op_state, flusher, y); - if (ret < 0) - return ret; + if (op_state.will_check_objects()) { + ret = bucket.check_object_index(dpp, op_state, flusher, y); + if (ret < 0) + return ret; + } ret = bucket.check_index(dpp, op_state, existing_stats, calculated_stats); if (ret < 0)