mon: include class in 'osd df [tree]' output

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

diff --git a/src/crush/CrushTreeDumper.h b/src/crush/CrushTreeDumper.h
index 70c48c83a6834e160198e1a55981d7276023eb2e..ca5a93fce783bc20cc0b7e3c6e4b6f966f8bd073 100644 (file)
--- a/src/crush/CrushTreeDumper.h
+++ b/src/crush/CrushTreeDumper.h
@@ -150,6 +150,10 @@ namespace CrushTreeDumper {
   inline void dump_item_fields(const CrushWrapper *crush,
                               const Item &qi, Formatter *f) {
     f->dump_int("id", qi.id);
+    const char *c = crush->get_item_class(qi.id);
+    if (!c)
+      c = "";
+    f->dump_string("device_class", c);
     if (qi.is_bucket()) {
       int type = crush->get_bucket_type(qi.id);
       f->dump_string("name", crush->get_item_name(qi.id));

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 2637df618bbd5891b0f8bfa13874cec67df1ebf0..6b5a09e5fe2f1998697293e63c70775e17f612cd 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -4071,6 +4071,7 @@ public:
 
   void dump(TextTable *tbl) {
     tbl->define_column("ID", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("CLASS", TextTable::LEFT, TextTable::RIGHT);
     tbl->define_column("WEIGHT", TextTable::LEFT, TextTable::RIGHT);
     tbl->define_column("REWEIGHT", TextTable::LEFT, TextTable::RIGHT);
     tbl->define_column("SIZE", TextTable::LEFT, TextTable::RIGHT);
@@ -4086,7 +4087,9 @@ public:
 
     dump_stray(tbl);
 
-    *tbl << "" << "" << "TOTAL"
+    *tbl << ""
+        << ""
+        << "" << "TOTAL"
         << si_t(pgs->get_osd_sum().kb << 10)
         << si_t(pgs->get_osd_sum().kb_used << 10)
         << si_t(pgs->get_osd_sum().kb_avail << 10)
@@ -4112,7 +4115,11 @@ protected:
                         double& var,
                         const size_t num_pgs,
                         TextTable *tbl) override {
+    const char *c = crush->get_item_class(qi.id);
+    if (!c)
+      c = "";
     *tbl << qi.id
+        << c
         << weightf_t(qi.weight)
         << weightf_t(reweight)
         << si_t(kb << 10)