From: David Zafman <dzafman@redhat.com>
Date: Fri, 6 Mar 2015 03:16:45 +0000 (-0800)
Subject: osd: FileJournal: Add _fdump() that takes Formatter instead of ostream
X-Git-Tag: v0.94.7~28^2~11^2~16
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f7ab316be9ce3592e0bc1c3a1012b0a83dfea2b4;p=ceph.git

osd: FileJournal: Add _fdump() that takes Formatter instead of ostream

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 130eba48495d0e6acd8a472cbf0c47ebbc7a038c)
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 0d34be68da3cb..8c2635e2f9667 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -583,7 +583,15 @@ int FileJournal::simple_dump(ostream& out)
 
 int FileJournal::_dump(ostream& out, bool simple)
 {
-  dout(10) << "dump" << dendl;
+  JSONFormatter f(true);
+  int ret = _fdump(f, simple);
+  f.flush(out);
+  return ret;
+}
+
+int FileJournal::_fdump(Formatter &f, bool simple)
+{
+  dout(10) << "_fdump" << dendl;
 
   assert(fd == -1);
   int err = _open(false, false);
@@ -598,7 +606,6 @@ int FileJournal::_dump(ostream& out, bool simple)
 
   off64_t next_pos = header.start;
 
-  JSONFormatter f(true);
   f.open_object_section("journal");
 
   f.open_object_section("header");
@@ -669,7 +676,6 @@ int FileJournal::_dump(ostream& out, bool simple)
 
   f.close_section();
   f.close_section();
-  f.flush(out);
   dout(10) << "dump finish" << dendl;
 
   close();
diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h
index 964dbe721bc76..71d7f2257b5e4 100644
--- a/src/os/FileJournal.h
+++ b/src/os/FileJournal.h
@@ -413,6 +413,7 @@ private:
 
   int dump(ostream& out);
   int simple_dump(ostream& out);
+  int _fdump(Formatter &f, bool simple);
 
   void flush();