osd: use CrushTreeDumper for printing osd tree.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 5a9370802f4a7ab2f2536709c82a2e713fe6a07e..bd7685b35420cd09fbbba941c418e830870a7138 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -24,6 +24,8 @@
 
 #include "common/code_environment.h"
 
+#include "crush/CrushTreeDumper.h"
+
 #define dout_subsys ceph_subsys_osd
 
 // ----------------------------------
@@ -2445,147 +2447,94 @@ void OSDMap::print(ostream& out) const
   // ignore pg_swap_primary
 }
 
-void OSDMap::print_osd_line(int cur, ostream *out, Formatter *f) const
-{
-  if (f) {
-    f->dump_unsigned("id", cur);
-    f->dump_stream("name") << "osd." << cur;
-    f->dump_unsigned("exists", (int)exists(cur));
-    f->dump_string("type", crush->get_type_name(0));
-    f->dump_int("type_id", 0);
-  }
-  if (out)
-    *out << "osd." << cur << "\t";
-  if (!exists(cur)) {
-    if (out)
-      *out << "DNE\t\t";
-  } else {
-    if (is_up(cur)) {
-      if (out)
-       *out << "up\t";
-      if (f)
-       f->dump_string("status", "up");
-    } else {
-      if (out)
-       *out << "down\t";
-      if (f)
-       f->dump_string("status", "down");
-    }
-    if (out) {
-      std::streamsize p = out->precision();
-      *out << std::setprecision(4)
-          << (exists(cur) ? get_weightf(cur) : 0)
-          << std::setprecision(p)
-          << "\t";
-      *out << std::setprecision(4)
-          << (exists(cur) ? get_primary_affinityf(cur) : 0)
-          << std::setprecision(p);
-    }
-    if (f) {
-      f->dump_float("reweight", get_weightf(cur));
-      f->dump_float("primary_affinity", get_primary_affinityf(cur));
+class OSDTreePlainDumper : public CrushTreeDumper::Dumper<ostream> {
+public:
+  typedef CrushTreeDumper::Dumper<ostream> Parent;
+  OSDTreePlainDumper(const CrushWrapper *crush, const OSDMap *osdmap_)
+    : Parent(crush), osdmap(osdmap_) {}
+
+  void dump(ostream *out) {
+    *out << "# id\tweight\ttype name\tup/down\treweight\tprimary-affinity\n";
+    Parent::dump(out);
+    for (int i = 0; i <= osdmap->get_max_osd(); i++) {
+      if (osdmap->exists(i) && !is_touched(i))
+       dump_item(CrushTreeDumper::Item(i, 0, 0), out);
     }
   }
-}
 
-void OSDMap::print_tree(ostream *out, Formatter *f) const
-{
-  if (out)
-    *out << "# id\tweight\ttype name\tup/down\treweight\tprimary-affinity\n";
-  if (f)
-    f->open_array_section("nodes");
-  set<int> touched;
-  set<int> roots;
-  crush->find_roots(roots);
-  for (set<int>::iterator p = roots.begin(); p != roots.end(); ++p) {
-    list<qi> q;
-    q.push_back(qi(*p, 0, crush->get_bucket_weight(*p) / (float)0x10000));
-    while (!q.empty()) {
-      int cur = q.front().item;
-      int depth = q.front().depth;
-      float weight = q.front().weight;
-      q.pop_front();
-
-      if (out) {
-       *out << cur << "\t";
-       int oldprecision = out->precision();
-       *out << std::setprecision(4) << weight << std::setprecision(oldprecision) << "\t";
-
-       for (int k=0; k<depth; k++)
-         *out << "\t";
-      }
-      if (f) {
-       f->open_object_section("item");
-      }
-      if (cur >= 0) {
-       print_osd_line(cur, out, f);
-       if (out)
-         *out << "\n";
-       if (f) {
-         f->dump_float("crush_weight", weight);
-         f->dump_unsigned("depth", depth);
-         f->close_section();
-       }
-       touched.insert(cur);
-      }
-      if (cur >= 0) {
-       continue;
-      }
+protected:
+  virtual void dump_item(const CrushTreeDumper::Item &qi, ostream *out) {
+    std::streamsize p = out->precision();
 
-      // queue bucket contents...
-      int type = crush->get_bucket_type(cur);
-      int s = crush->get_bucket_size(cur);
-      if (f) {
-       f->dump_int("id", cur);
-       f->dump_string("name", crush->get_item_name(cur));
-       f->dump_string("type", crush->get_type_name(type));
-       f->dump_int("type_id", type);
-       f->open_array_section("children");
-      }
-      for (int k=s-1; k>=0; k--) {
-       int item = crush->get_bucket_item(cur, k);
-       q.push_front(qi(item, depth+1, (float)crush->get_bucket_item_weight(cur, k) / (float)0x10000));
-       if (f)
-         f->dump_int("child", item);
-      }
-      if (f)
-       f->close_section();
+    *out << qi.id << "\t"
+        << std::setprecision(4) << qi.weight << "\t";
 
-      if (out)
-       *out << crush->get_type_name(type) << " " << crush->get_item_name(cur) << "\n";
-      if (f) {
-       f->close_section();
-      }
+    for (int k=0; k < qi.depth; k++)
+      *out << "\t";
 
+    if (qi.is_bucket())
+    {
+      *out << crush->get_type_name(crush->get_bucket_type(qi.id)) << " "
+          << crush->get_item_name(qi.id);
+    }
+    else
+    {
+      *out << "osd." << qi.id << "\t";
+      if (!osdmap->exists(qi.id))
+       *out << "DNE\t\t";
+      else
+       *out << (osdmap->is_up(qi.id) ? "up" : "down") << "\t";
+      *out << (osdmap->exists(qi.id) ? osdmap->get_weightf(qi.id) : 0) << "\t"
+          << (osdmap->exists(qi.id) ? osdmap->get_primary_affinityf(qi.id) : 0);
     }
+    *out << std::setprecision(p) << "\n";
   }
-  if (f) {
+
+private:
+  const OSDMap *osdmap;
+};
+
+class OSDTreeFormattingDumper : public CrushTreeDumper::FormattingDumper {
+public:
+  typedef CrushTreeDumper::FormattingDumper Parent;
+
+  OSDTreeFormattingDumper(const CrushWrapper *crush, const OSDMap *osdmap_)
+    : Parent(crush), osdmap(osdmap_) {}
+
+  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))
+       dump_item(CrushTreeDumper::Item(i, 0, 0), f);
+    }
+    f->close_section();
   }
 
-  set<int> stray;
-  for (int i=0; i<max_osd; i++)
-    if (exists(i) && touched.count(i) == 0)
-      stray.insert(i);
-
-  if (!stray.empty()) {
-    if (out)
-      *out << "\n";
-    for (set<int>::iterator p = stray.begin(); p != stray.end(); ++p) {
-      if (out)
-       *out << *p << "\t0\t";
-      if (f)
-        f->open_object_section("osd");
-      print_osd_line(*p, out, f);
-      if (out)
-       *out << "\n";
-      if (f)
-        f->close_section();
+protected:
+  virtual void dump_item_fields(const CrushTreeDumper::Item &qi, Formatter *f) {
+    Parent::dump_item_fields(qi, f);
+    if (!qi.is_bucket())
+    {
+      f->dump_unsigned("exists", (int)osdmap->exists(qi.id));
+      f->dump_string("status", osdmap->is_up(qi.id) ? "up" : "down");
+      f->dump_float("reweight", osdmap->get_weightf(qi.id));
+      f->dump_float("primary_affinity", osdmap->get_primary_affinityf(qi.id));
     }
   }
+
+private:
+  const OSDMap *osdmap;
+};
+
+void OSDMap::print_tree(ostream *out, Formatter *f) const
+{
+  if (out)
+    OSDTreePlainDumper(crush.get(), this).dump(out);
   if (f)
-    f->close_section();
+    OSDTreeFormattingDumper(crush.get(), this).dump(f);
 }
 
 void OSDMap::print_summary(Formatter *f, ostream& out) const