From 8b2f4858842518b180617cb818cb7960c69edfb6 Mon Sep 17 00:00:00 2001 From: Cory Snyder Date: Mon, 25 Sep 2023 10:06:41 +0000 Subject: [PATCH] rgw: fix output formatting of bucket index check admin api The bucket index check admin API was previously returning invalid JSON. Signed-off-by: Cory Snyder (cherry picked from commit 32fb6a1a68398a99324b2e64ebe3bcf3a9ccf02a) Conflicts: src/rgw/driver/rados/rgw_bucket.cc Cherry-pick notes: - Conflicts due to check_bad_index_multipart taking optional_yield param on main --- src/rgw/driver/rados/rgw_bucket.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rgw/driver/rados/rgw_bucket.cc b/src/rgw/driver/rados/rgw_bucket.cc index 6e68e97f7a24..63ca0650a389 100644 --- a/src/rgw/driver/rados/rgw_bucket.cc +++ b/src/rgw/driver/rados/rgw_bucket.cc @@ -1221,6 +1221,7 @@ int RGWBucketAdminOp::check_index(rgw::sal::Driver* driver, RGWBucketAdminOpStat Formatter *formatter = flusher.get_formatter(); flusher.start(0); + formatter->open_object_section("bucket_check"); ret = bucket.check_bad_index_multipart(op_state, flusher, dpp); if (ret < 0) @@ -1237,6 +1238,8 @@ int RGWBucketAdminOp::check_index(rgw::sal::Driver* driver, RGWBucketAdminOpStat return ret; dump_index_check(existing_stats, calculated_stats, formatter); + + formatter->close_section(); flusher.flush(); return 0; -- 2.47.3