]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix output formatting of bucket index check admin api 53823/head
authorCory Snyder <csnyder@1111systems.com>
Mon, 25 Sep 2023 10:06:41 +0000 (10:06 +0000)
committerCasey Bodley <cbodley@redhat.com>
Wed, 18 Oct 2023 15:05:39 +0000 (11:05 -0400)
The bucket index check admin API was previously returning invalid
JSON.

Signed-off-by: Cory Snyder <csnyder@1111systems.com>
(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

index 6e68e97f7a240017c073e25f2d8980f815ad129f..63ca0650a389f94f74c05ed3f9fe4ec23ed4b177 100644 (file)
@@ -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;