update sources to v12.1.0

[ceph.git] / ceph / src / crush / CrushTreeDumper.h

diff --git a/ceph/src/crush/CrushTreeDumper.h b/ceph/src/crush/CrushTreeDumper.h
index 3286fc72c31850200bb0dd08fd08316c2c50ac60..40691c697d3a75487eb0414ded0470b597b5ec4c 100644 (file)
--- a/ceph/src/crush/CrushTreeDumper.h
+++ b/ceph/src/crush/CrushTreeDumper.h
@@ -76,8 +76,31 @@ namespace CrushTreeDumper {
       clear();
     }
 
+    virtual bool should_dump_leaf(int i) const {
+      return true;
+    }
+    virtual bool should_dump_empty_bucket() const {
+      return true;
+    }
+
+    bool should_dump(int id) {
+      if (id >= 0)
+       return should_dump_leaf(id);
+      if (should_dump_empty_bucket())
+       return true;
+      int s = crush->get_bucket_size(id);
+      for (int k = s - 1; k >= 0; k--) {
+       int c = crush->get_bucket_item(id, k);
+       if (should_dump(c))
+         return true;
+      }
+      return false;
+    }
+
     bool next(Item &qi) {
       if (empty()) {
+       while (root != roots.end() && !should_dump(*root))
+         ++root;
        if (root == roots.end())
          return false;
        push_back(Item(*root, 0, crush->get_bucket_weightf(*root)));
@@ -93,9 +116,11 @@ namespace CrushTreeDumper {
        int s = crush->get_bucket_size(qi.id);
        for (int k = s - 1; k >= 0; k--) {
          int id = crush->get_bucket_item(qi.id, k);
-         qi.children.push_back(id);
-         push_front(Item(id, qi.depth + 1,
-                         crush->get_bucket_item_weightf(qi.id, k)));
+         if (should_dump(id)) {
+           qi.children.push_back(id);
+           push_front(Item(id, qi.depth + 1,
+                           crush->get_bucket_item_weightf(qi.id, k)));
+         }
        }
       }
       return true;