Merge pull request ceph#8743 from ceph/revert-8502-song20

Revert "crushtool: do not allow to compile crushmap with repeat rules… Reviewed-by: Sage Weil <sage@redhat.com>
sunfch · Apr 25, 2016 · 850e343 · 850e343
2 parents ff18083 + edfe301
commit 850e343
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
@@ -608,10 +608,6 @@ int CrushCompiler::parse_rule(iter_t const& i)
   }
 
   int ruleset = int_node(i->children[start]);
-  if (ruleset_name.count(ruleset)) {
-    err << "ruleset '" << ruleset << "' already defined in rule '" << ruleset_name[ruleset] <<"'\n"<< std::endl;
-    return -1;
-  }
 
   string tname = string_node(i->children[start+2]);
   int type;
@@ -728,7 +724,6 @@ int CrushCompiler::parse_rule(iter_t const& i)
     }
   }
   assert(step == steps);
-  ruleset_name[ruleset] = rname;
   return 0;
 }
 

diff --git a/src/crush/CrushCompiler.h b/src/crush/CrushCompiler.h
@@ -39,7 +39,7 @@ class CrushCompiler {
   map<int, unsigned> item_weight;
   map<string, int> type_id;
   map<string, int> rule_id;
-  map<int, string> ruleset_name;
+
   string string_node(node_t &node);
   int int_node(node_t &node); 
   float float_node(node_t &node);