From: liuchang0812 <liuchang0812@gmail.com>
Date: Wed, 29 Mar 2017 02:27:39 +0000 (+0800)
Subject: osd: print pg_info_t::purged_snaps as array, not string
X-Git-Tag: v12.0.2~216^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3af7b254e5aafaa0dda38782301f25c40415130c;p=ceph.git

osd: print pg_info_t::purged_snaps as array, not string

Fixes: http://tracker.ceph.com/issues/18584
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 7eedcd3a2e456..2cce17e029fc1 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -2873,7 +2873,16 @@ void pg_info_t::dump(Formatter *f) const
   f->dump_int("last_user_version", last_user_version);
   f->dump_stream("last_backfill") << last_backfill;
   f->dump_int("last_backfill_bitwise", (int)last_backfill_bitwise);
-  f->dump_stream("purged_snaps") << purged_snaps;
+  f->open_array_section("purged_snaps");
+  for (interval_set<snapid_t>::const_iterator i=purged_snaps.begin();
+       i != purged_snaps.end();
+       ++i) {
+    f->open_object_section("purged_snap_interval");
+    f->dump_stream("start") << i.get_start();
+    f->dump_stream("length") << i.get_len();
+    f->close_section();
+  }
+  f->close_section();
   f->open_object_section("history");
   history.dump(f);
   f->close_section();