mds: Add dump-journal-entries

This adds a somewhat-human-readable peer to
the 'dump-journal' command.

Signed-off-by: John Spray <john.spray@inktank.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 14b84097bc2..1f1fbd319d7 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -56,7 +56,9 @@ void usage()
        << "  --debug_mds n\n"
        << "        debug MDS level (e.g. 10)\n"
        << "  --dump-journal rank filename\n"
-       << "        dump the MDS journal for rank.\n"
+       << "        dump the MDS journal (binary) for rank.\n"
+       << "  --dump-journal-entries rank filename\n"
+       << "        dump the MDS journal (JSON) for rank.\n"
        << "  --journal-check rank\n"
        << "        replay the journal for rank, then exit\n"
        << "  --hot-standby rank\n"
@@ -79,6 +81,11 @@ static int do_cmds_special_action(const std::string &action,
     journal_dumper.init(rank);
     journal_dumper.dump(dump_file.c_str());
     journal_dumper.shutdown();
+  } else if (action == "dump-journal-entries") {
+    Dumper journal_dumper;
+    journal_dumper.init(rank);
+    journal_dumper.dump_entries();
+    journal_dumper.shutdown();
   } else if (action == "undump-journal") {
     dout(0) << "undumping journal for mds." << rank << " from " << dump_file << dendl;
     Dumper journal_dumper;
@@ -171,6 +178,10 @@ int main(int argc, const char **argv)
       }
       dump_file = *i++;
     }
+    else if (ceph_argparse_witharg(args, i, &val, "--dump-journal-entries", (char*)NULL)){
+      set_special_action(action, "dump-journal-entries");
+      rank = parse_rank("dump-journal-entries", val);
+    }
     else if (ceph_argparse_witharg(args, i, &val, "--reset-journal", (char*)NULL)) {
       set_special_action(action, "reset-journal");
       rank = parse_rank("reset-journal", val);