crush/CrushCompiler: fix id scan to include class ids

The bucket stanza may specify the canonical id for the bucket as well as
ids for the shadow trees.  Make not of all ids so we can avoid colliding
and reusing them later.

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

diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
index ee5017555ad477a5b9c8d2d56c601424d4ba87e2..a512489bc575328a289bb5adfa95eb2910245305 100644 (file)
--- a/src/crush/CrushCompiler.cc
+++ b/src/crush/CrushCompiler.cc
@@ -1053,9 +1053,13 @@ void CrushCompiler::find_used_bucket_ids(iter_t const& i)
 {
   for (iter_t p = i->children.begin(); p != i->children.end(); p++) {
     if ((int)p->value.id().to_long() == crush_grammar::_bucket) {
-      iter_t firstline = p->children.begin() + 3;
-      string tag = string_node(firstline->children[0]);
-      if (tag == "id") {
+      for (iter_t firstline = p->children.begin() + 3;
+          firstline != p->children.end();
+          ++firstline) {
+       string tag = string_node(firstline->children[0]);
+       if (tag != "id") {
+         break;
+       }
        int id = int_node(firstline->children[1]);
        //err << "saw bucket id " << id << std::endl;
        id_item[id] = string();