filejournal: dump injson

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 3cd2c5036785d1d06cff6b4e5ab646dfd1b6777b..bf7abe2e4ff93f9c4b41087ff8ab0d64e4cb0243 100644 (file)
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -568,6 +568,9 @@ int FileJournal::dump(ostream& out)
 
   read_pos = header.start;
 
+  JSONFormatter f(true);
+
+  f.open_array_section("journal");
   while (1) {
     bufferlist bl;
     uint64_t seq = 0;
@@ -577,16 +580,27 @@ int FileJournal::dump(ostream& out)
       break;
     }
 
-    out << "offset " << pos << " seq " << seq << "\n";
-   
+    f.open_object_section("entry");
+    f.dump_unsigned("offset", pos);
+    f.dump_unsigned("seq", seq);
+    f.open_array_section("transactions");
     bufferlist::iterator p = bl.begin();
+    int trans_num = 0;
     while (!p.end()) {
       ObjectStore::Transaction *t = new ObjectStore::Transaction(p);
-      t->dump(out);
+      f.open_object_section("transaction");
+      f.dump_unsigned("trans_num", trans_num);
+      t->dump(&f);
+      f.close_section();
       delete t;
+      trans_num++;
     }
+    f.close_section();
+    f.close_section();
+    f.flush(cout);
   }
-  out << std::endl;
+
+  f.close_section();
   dout(10) << "dump finish" << dendl;
   return 0;
 }