mon: 'osd tree [epoch]'

Dump crush map + osd state, displayed as a tree.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0a0da6e7533db3b39ab2d3057bf40aad4a3a51d0..e0eb2b878ef73d11d7a6f0fdeb04679be2d0b539 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1163,6 +1163,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
       r = 0;
     }
     else if (m->cmd[1] == "dump" ||
+            m->cmd[1] == "tree" ||
             m->cmd[1] == "getmap" ||
             m->cmd[1] == "getcrushmap") {
       OSDMap *p = &osdmap;
@@ -1184,6 +1185,11 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
          p->print(ds);
          rdata.append(ds);
          ss << "dumped osdmap epoch " << p->get_epoch();
+       } else if (m->cmd[1] == "tree") {
+         stringstream ds;
+         p->print_tree(ds);
+         rdata.append(ds);
+         ss << "dumped osdmap tree epoch " << p->get_epoch();
        } else if (m->cmd[1] == "getmap") {
          p->encode(rdata);
          ss << "got osdmap epoch " << p->get_epoch();