crushtool: error out if uniform weights vary

Fixes: #1075
Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/crushtool.cc b/src/crushtool.cc
index 45b2d58afab075cfe5190d643f273c882d11065f..d08f199ec0988faa0a0ad403848e6a8754e53bbe 100644 (file)
--- a/src/crushtool.cc
+++ b/src/crushtool.cc
@@ -179,6 +179,8 @@ void parse_bucket(iter_t const& i, CrushWrapper &crush)
 
   int curpos = 0;
   float bucketweight = 0;
+  bool have_uniform_weight = false;
+  float uniform_weight = 0;
   for (unsigned p=3; p<i->children.size()-1; p++) {
     iter_t sub = i->children.begin() + p;
     string tag = string_node(sub->children[0]);
@@ -205,6 +207,21 @@ void parse_bucket(iter_t const& i, CrushWrapper &crush)
        else
          assert(0);
       }
+      if (alg == CRUSH_BUCKET_UNIFORM) {
+       if (!have_uniform_weight) {
+         have_uniform_weight = true;
+         uniform_weight = weight;
+       } else {
+         if (uniform_weight != weight) {
+           cerr << "item '" << iname << "' in uniform bucket '" << name << "' has weight " << weight
+                << " but previous item(s) have weight " << uniform_weight
+                << "; uniform bucket items must all have identical weights." << std::endl;
+           exit(1);
+         }
+       }
+      }
+         
+
       if (pos >= size) {
        cerr << "item '" << iname << "' in bucket '" << name << "' has pos " << pos << " >= size " << size << std::endl;
        exit(1);