Merge pull request ceph#60787 from ronen-fr/wip-rf-reservStat

ronen-fr · web-flow · commit 6cc529297109 · 2024-11-22T08:33:57.000+02:00
osd/scrub: fixing reservations dump format

Reviewed-by: Nitzan Mordechai &lt;nmordech@redhat.com&gt;
diff --git a/src/osd/scrubber/osd_scrub.cc b/src/osd/scrubber/osd_scrub.cc
@@ -65,7 +65,7 @@ void OsdScrub::dump_scrubs(ceph::Formatter* f) const
 void OsdScrub::dump_scrub_reservations(ceph::Formatter* f) const
 {
   m_resource_bookkeeper.dump_scrub_reservations(f);
-  f->open_array_section("remote_scrub_reservations");
+  f->open_object_section("remote_scrub_reservations");
   m_osd_svc.get_scrub_reserver().dump(f);
   f->close_section();
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void OsdScrub::dump_scrubs(ceph::Formatter* f) const`
`65`	`65`	`void OsdScrub::dump_scrub_reservations(ceph::Formatter* f) const`
`66`	`66`	`{`
`67`	`67`	`m_resource_bookkeeper.dump_scrub_reservations(f);`
`68`		`- f->open_array_section("remote_scrub_reservations");`
	`68`	`+ f->open_object_section("remote_scrub_reservations");`
`69`	`69`	`m_osd_svc.get_scrub_reserver().dump(f);`
`70`	`70`	`f->close_section();`
`71`	`71`	`}`