Merge pull request ceph#60499 from clwluvw/bucket-layout-output

cbodley · web-flow · commit ce87d8fc55d8 · 2024-12-16T12:12:40.000-05:00
rgw: fix json output for bucket layout

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/rgw_bucket_layout.cc b/src/rgw/rgw_bucket_layout.cc
@@ -376,9 +376,9 @@ void encode_json_impl(const char *name, const BucketLayout& l, ceph::Formatter *
   for (const auto& log : l.logs) {
     encode_json("log", log, f);
   }
+  f->close_section(); // logs[]
   utime_t jt(l.judge_reshard_lock_time);
   encode_json("judge_reshard_lock_time", jt, f);
-  f->close_section(); // logs[]
   f->close_section();
 }
 void decode_json_obj(BucketLayout& l, JSONObj *obj)

Original file line number	Diff line number	Diff line change
`@@ -376,9 +376,9 @@ void encode_json_impl(const char name, const BucketLayout& l, ceph::Formatter `
`376`	`376`	`for (const auto& log : l.logs) {`
`377`	`377`	`encode_json("log", log, f);`
`378`	`378`	`}`
	`379`	`+ f->close_section(); // logs[]`
`379`	`380`	`utime_t jt(l.judge_reshard_lock_time);`
`380`	`381`	`encode_json("judge_reshard_lock_time", jt, f);`
`381`		`- f->close_section(); // logs[]`
`382`	`382`	`f->close_section();`
`383`	`383`	`}`
`384`	`384`	`void decode_json_obj(BucketLayout& l, JSONObj *obj)`