mon/OSDMonitor: list osd tree in named bucket

Signed-off-by: kungf <yang.wang@easystack.cn>

diff --git a/src/crush/CrushTreeDumper.h b/src/crush/CrushTreeDumper.h
index 6591b1bcdb40749f916fc21228c655114542c8eb..0c4b79e569bf4eeff16e14ebf31cb1f104124da1 100644 (file)
--- a/src/crush/CrushTreeDumper.h
+++ b/src/crush/CrushTreeDumper.h
@@ -167,6 +167,14 @@ namespace CrushTreeDumper {
 
     bool is_touched(int id) const { return touched.count(id) > 0; }
 
+    void set_root(const string& bucket) {
+      roots.clear();
+      if (crush->name_exists(bucket)) {
+       int i = crush->get_item_id(bucket);
+       roots.insert(i);
+      }
+    }
+
   protected:
     virtual void dump_item(const Item &qi, F *f) = 0;
 

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 4694c1102b4622d032b1444d7e1a19602a0e1b33..c70e0207e4d0d4a3648f58634d35531dbe32ef90 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -453,6 +453,11 @@ COMMAND("osd tree " \
        "name=epoch,type=CephInt,range=0,req=false " \
        "name=states,type=CephChoices,strings=up|down|in|out|destroyed,n=N,req=false", \
        "print OSD tree", "osd", "r", "cli,rest")
+COMMAND("osd tree-from " \
+       "name=epoch,type=CephInt,range=0,req=false " \
+       "name=bucket,type=CephString " \
+       "name=states,type=CephChoices,strings=up|down|in|out|destroyed,n=N,req=false", \
+       "print OSD tree in bucket", "osd", "r", "cli,rest")
 COMMAND("osd ls " \
        "name=epoch,type=CephInt,range=0,req=false", \
        "show all OSD ids", "osd", "r", "cli,rest")

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 6a6a29ec235617e26d393d9943e4ca872202fcea..a518eb7ff10f7f44cf206f3cccaf8b84052c10c5 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3497,6 +3497,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
   }
   else if (prefix == "osd dump" ||
           prefix == "osd tree" ||
+          prefix == "osd tree-from" ||
           prefix == "osd ls" ||
           prefix == "osd getmap" ||
           prefix == "osd getcrushmap" ||
@@ -3567,7 +3568,11 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
        }
       }
       rdata.append(ds);
-    } else if (prefix == "osd tree") {
+    } else if (prefix == "osd tree" || prefix == "osd tree-from") {
+      string bucket;
+      if (prefix == "osd tree-from")
+       cmd_getval(cct, cmdmap, "bucket", bucket);
+
       vector<string> states;
       cmd_getval(cct, cmdmap, "states", states);
       unsigned filter = 0;
@@ -3606,11 +3611,11 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
       }
       if (f) {
        f->open_object_section("tree");
-       p->print_tree(f.get(), NULL, filter);
+       p->print_tree(f.get(), NULL, filter, bucket);
        f->close_section();
        f->flush(ds);
       } else {
-       p->print_tree(NULL, &ds, filter);
+       p->print_tree(NULL, &ds, filter, bucket);
       }
       rdata.append(ds);
     } else if (prefix == "osd getmap") {

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index e06dafca4ec144a9abb969e643d2f1cad21d9b96..3183662b9c15da6e558ecad8d4c951ccc8b21c28 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -3051,7 +3051,7 @@ public:
     return !filter;
   }
 
-  void dump(TextTable *tbl) {
+  void init_table(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);
@@ -3059,12 +3059,19 @@ public:
     tbl->define_column("STATUS", TextTable::LEFT, TextTable::RIGHT);
     tbl->define_column("REWEIGHT", TextTable::LEFT, TextTable::RIGHT);
     tbl->define_column("PRI-AFF", TextTable::LEFT, TextTable::RIGHT);
+  }
+  void dump(TextTable *tbl, string& bucket) {
+    init_table(tbl);
 
-    Parent::dump(tbl);
-
-    for (int i = 0; i < osdmap->get_max_osd(); i++) {
-      if (osdmap->exists(i) && !is_touched(i) && should_dump_leaf(i)) {
-       dump_item(CrushTreeDumper::Item(i, 0, 0, 0), tbl);
+    if (!bucket.empty()) {
+      set_root(bucket);
+      Parent::dump(tbl);
+    } else {
+      Parent::dump(tbl);
+      for (int i = 0; i < osdmap->get_max_osd(); i++) {
+       if (osdmap->exists(i) && !is_touched(i) && should_dump_leaf(i)) {
+         dump_item(CrushTreeDumper::Item(i, 0, 0, 0), tbl);
+       }
       }
     }
   }
@@ -3141,16 +3148,23 @@ public:
     return !filter;
   }
 
-  void dump(Formatter *f) {
-    f->open_array_section("nodes");
-    Parent::dump(f);
-    f->close_section();
-    f->open_array_section("stray");
-    for (int i = 0; i < osdmap->get_max_osd(); i++) {
-      if (osdmap->exists(i) && !is_touched(i) && should_dump_leaf(i))
-       dump_item(CrushTreeDumper::Item(i, 0, 0, 0), f);
+  void dump(Formatter *f, string& bucket) {
+    if (!bucket.empty()) {
+      set_root(bucket);
+      f->open_array_section("nodes");
+      Parent::dump(f);
+      f->close_section();
+    } else {
+      f->open_array_section("nodes");
+      Parent::dump(f);
+      f->close_section();
+      f->open_array_section("stray");
+      for (int i = 0; i < osdmap->get_max_osd(); i++) {
+       if (osdmap->exists(i) && !is_touched(i) && should_dump_leaf(i))
+         dump_item(CrushTreeDumper::Item(i, 0, 0, 0), f);
+      }
+      f->close_section();
     }
-    f->close_section();
   }
 
 protected:
@@ -3178,14 +3192,14 @@ private:
   const unsigned filter;
 };
 
-void OSDMap::print_tree(Formatter *f, ostream *out, unsigned filter) const
+void OSDMap::print_tree(Formatter *f, ostream *out, unsigned filter, string bucket) const
 {
   if (f) {
-    OSDTreeFormattingDumper(crush.get(), this, filter).dump(f);
+    OSDTreeFormattingDumper(crush.get(), this, filter).dump(f, bucket);
   } else {
     assert(out);
     TextTable tbl;
-    OSDTreePlainDumper(crush.get(), this, filter).dump(&tbl);
+    OSDTreePlainDumper(crush.get(), this, filter).dump(&tbl, bucket);
     *out << tbl;
   }
 }

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 948d0132af1627e45b17411551ecad47d87b42a3..cc2e8fed1874eb3847b704c07e4af12b5208bfeb 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -1347,7 +1347,7 @@ public:
     DUMP_DOWN = 8,       // only 'down' osds
     DUMP_DESTROYED = 16, // only 'destroyed' osds
   };
-  void print_tree(Formatter *f, ostream *out, unsigned dump_flags=0) const;
+  void print_tree(Formatter *f, ostream *out, unsigned dump_flags=0, string bucket="") const;
 
   int summarize_mapping_stats(
     OSDMap *newmap,