osd/OSDMap: observe 'osd crush chooseleaf type' option for initial rules

This option was dropped by 2a7fcc35b8ceeff1e07da28b10ced4a2a4ed09ec.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index f2efd400eb21557809bbf4e47e21be88b2dbee5c..ffbbdff5e42435b1b44f9518cd8a0d139227be80 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1969,12 +1969,15 @@ int OSDMap::build_simple_crush_map(CephContext *cct, CrushWrapper& crush,
     crush.insert_item(cct, o, 1.0, name, loc);
   }
 
-  r = crush.add_simple_ruleset("replicated_ruleset", "default", "host",
+  string failure_domain =
+    crush.get_type_name(cct->_conf->osd_crush_chooseleaf_type);
+
+  r = crush.add_simple_ruleset("replicated_ruleset", "default", failure_domain,
                               "firstn", pg_pool_t::TYPE_REPLICATED, ss);
   if (r < 0)
     return r;
 
-  r = crush.add_simple_ruleset("erasure_ruleset", "default", "host",
+  r = crush.add_simple_ruleset("erasure_ruleset", "default", failure_domain,
                               "indep", pg_pool_t::TYPE_ERASURE, ss);
   if (r < 0)
     return r;
@@ -2049,11 +2052,14 @@ int OSDMap::build_simple_crush_map_from_conf(CephContext *cct,
     crush.insert_item(cct, o, 1.0, *i, loc);
   }
 
-  r = crush.add_simple_ruleset("replicated_ruleset", "default", "host",
+  string failure_domain =
+    crush.get_type_name(cct->_conf->osd_crush_chooseleaf_type);
+
+  r = crush.add_simple_ruleset("replicated_ruleset", "default", failure_domain,
                               "firstn", pg_pool_t::TYPE_REPLICATED, ss);
   if (r < 0)
     return r;
-  r = crush.add_simple_ruleset("erasure_ruleset", "default", "host",
+  r = crush.add_simple_ruleset("erasure_ruleset", "default", failure_domain,
                               "indep", pg_pool_t::TYPE_ERASURE, ss);
   if (r < 0)
     return r;