]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: include device class in 'osd tree' output
authorSage Weil <sage@redhat.com>
Thu, 29 Jun 2017 14:01:45 +0000 (10:01 -0400)
committerSage Weil <sage@redhat.com>
Sun, 9 Jul 2017 02:35:22 +0000 (22:35 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSDMap.cc

index 6b5a09e5fe2f1998697293e63c70775e17f612cd..ec540c1918016e3b8de799d6bd4b929f754c168f 100644 (file)
@@ -3072,6 +3072,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("TYPE NAME", TextTable::LEFT, TextTable::LEFT);
     tbl->define_column("UP/DOWN", TextTable::LEFT, TextTable::RIGHT);
@@ -3089,8 +3090,11 @@ public:
 
 protected:
   void dump_item(const CrushTreeDumper::Item &qi, TextTable *tbl) override {
-
+    const char *c = crush->get_item_class(qi.id);
+    if (!c)
+      c = "";
     *tbl << qi.id
+        << c
         << weightf_t(qi.weight);
 
     ostringstream name;