From aad54d5ee54abb4231dd8c9020d98f6f256bde75 Mon Sep 17 00:00:00 2001 From: Cory Snyder Date: Fri, 22 Sep 2023 08:35:16 +0000 Subject: [PATCH] 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 (cherry picked from commit 6b057fe55413c0eaf9959f006584cba6cc4c192a) --- src/rgw/driver/rados/rgw_bucket.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/rgw/driver/rados/rgw_bucket.cc b/src/rgw/driver/rados/rgw_bucket.cc index 42a66b45540..6e68e97f7a2 100644 --- a/src/rgw/driver/rados/rgw_bucket.cc +++ b/src/rgw/driver/rados/rgw_bucket.cc @@ -1226,9 +1226,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) -- 2.39.5