ceph-objectstore-tool: For import/export --debug dump the log

Move log dumping code to common function dump_log()

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index fa6baa4a5f9c9eca346dabf620a0defb58158abd..4332f3f68ad6eb7bcd90e3601e7ae9b5e294ce1f 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -662,6 +662,33 @@ int get_log(ObjectStore *fs, __u8 struct_ver,
   return 0;
 }
 
+void dump_log(Formatter *formatter, ostream &out, pg_log_t &log,
+      pg_missing_t &missing, map<eversion_t, hobject_t> &divergent_priors)
+{
+  formatter->open_object_section("op_log");
+  formatter->open_object_section("pg_log_t");
+  log.dump(formatter);
+  formatter->close_section();
+  formatter->flush(out);
+  formatter->open_object_section("pg_missing_t");
+  missing.dump(formatter);
+  formatter->close_section();
+  formatter->flush(out);
+  formatter->open_object_section("map");
+  formatter->open_array_section("divergent_priors");
+  for (map<eversion_t, hobject_t>::iterator it = divergent_priors.begin();
+       it != divergent_priors.end(); ++ it) {
+      formatter->open_object_section("item");
+      formatter->dump_stream("eversion") << it->first;
+      formatter->dump_stream("hobject") << it->second;
+      formatter->close_section();
+  }
+  formatter->close_section();
+  formatter->close_section();
+  formatter->close_section();
+  formatter->flush(out);
+}
+
 //Based on RemoveWQ::_process()
 void remove_coll(ObjectStore *store, const coll_t &coll)
 {
@@ -1091,6 +1118,12 @@ int do_export(ObjectStore *fs, coll_t coll, spg_t pgid, pg_info_t &info,
   if (ret > 0)
       return ret;
 
+  if (debug) {
+    Formatter *formatter = Formatter::create("json-pretty");
+    assert(formatter);
+    dump_log(formatter, cerr, log, missing, divergent_priors);
+    delete formatter;
+  }
   write_super();
 
   pg_begin pgb(pgid, superblock);
@@ -2008,6 +2041,13 @@ int do_import(ObjectStore *store, OSDSuperblock& sb, bool force)
         cerr << "Skipping divergent_prior " << *i << std::endl;
     }
 
+    if (debug) {
+      pg_missing_t missing;
+      Formatter *formatter = Formatter::create("json-pretty");
+      dump_log(formatter, cerr, newlog, missing, ms.divergent_priors);
+      delete formatter;
+    }
+
     ret = write_pg(t, ms.map_epoch, ms.info, newlog, ms.past_intervals, ms.divergent_priors);
     if (ret) return ret;
   }
@@ -3337,28 +3377,7 @@ int main(int argc, char **argv)
       if (ret < 0)
           goto out;
 
-      formatter->open_object_section("op_log");
-      formatter->open_object_section("pg_log_t");
-      log.dump(formatter);
-      formatter->close_section();
-      formatter->flush(cout);
-      formatter->open_object_section("pg_missing_t");
-      missing.dump(formatter);
-      formatter->close_section();
-      formatter->flush(cout);
-      formatter->open_object_section("map");
-      formatter->open_array_section("divergent_priors");
-      for (map<eversion_t, hobject_t>::iterator it = divergent_priors.begin();
-           it != divergent_priors.end(); ++ it) {
-          formatter->open_object_section("item");
-          formatter->dump_stream("eversion") << it->first;
-          formatter->dump_stream("hobject") << it->second;
-          formatter->close_section();
-      }
-      formatter->close_section();
-      formatter->close_section();
-      formatter->close_section();
-      formatter->flush(cout);
+      dump_log(formatter, cout, log, missing, divergent_priors);
     } else if (op == "rm-past-intervals") {
       ObjectStore::Transaction tran;
       ObjectStore::Transaction *t = &tran;