crush/CrushWrapper: get_osd_pool_default_crush_replicated_ruleset -> rule

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

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 064c4c9b916655c911f6f6eb9a17cfaddc674ccc..094fd0aa12762169f052d2faf22bf6d93a7cb5b3 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -3794,20 +3794,21 @@ void CrushWrapper::generate_test_instances(list<CrushWrapper*>& o)
 }
 
 /**
- * Determine the default CRUSH ruleset ID to be used with
+ * Determine the default CRUSH rule ID to be used with
  * newly created replicated pools.
  *
- * @returns a ruleset ID (>=0) or -1 if no suitable ruleset found
+ * @returns a rule ID (>=0) or -1 if no suitable rule found
  */
-int CrushWrapper::get_osd_pool_default_crush_replicated_ruleset(CephContext *cct)
+int CrushWrapper::get_osd_pool_default_crush_replicated_rule(
+  CephContext *cct)
 {
-  int crush_ruleset = cct->_conf.get_val<int64_t>("osd_pool_default_crush_rule");
-  if (crush_ruleset < 0) {
-    crush_ruleset = find_first_ruleset(pg_pool_t::TYPE_REPLICATED);
-  } else if (!ruleset_exists(crush_ruleset)) {
-    crush_ruleset = -1; // match find_first_ruleset() retval
+  int crush_rule = cct->_conf.get_val<int64_t>("osd_pool_default_crush_rule");
+  if (crush_rule < 0) {
+    crush_rule = find_first_rule(pg_pool_t::TYPE_REPLICATED);
+  } else if (!rule_exists(crush_rule)) {
+    crush_rule = -1; // match find_first_ruleset() retval
   }
-  return crush_ruleset;
+  return crush_rule;
 }
 
 bool CrushWrapper::is_valid_crush_name(const string& s)

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index 30e278a6404c795a40264b828487f7192df48f86..ff03da9d11f4b8b4b9d1b30eaae1b01728f7d08f 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -1653,7 +1653,7 @@ public:
                 const CrushTreeDumper::name_map_t& ws) const;
   static void generate_test_instances(std::list<CrushWrapper*>& o);
 
-  int get_osd_pool_default_crush_replicated_ruleset(CephContext *cct);
+  int get_osd_pool_default_crush_replicated_rule(CephContext *cct);
 
   static bool is_valid_crush_name(const std::string& s);
   static bool is_valid_crush_loc(CephContext *cct,

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index bfc6bef5d86a4d000cbf6c01c597dbea3ba0f8ba..7cf85679cbf5a42cd004f5698648e90f363ee449 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7699,7 +7699,7 @@ int OSDMonitor::prepare_pool_crush_rule(const unsigned pool_type,
            *crush_rule = get_replicated_stretch_crush_rule();
          } else {
            // Use default rule
-           *crush_rule = osdmap.crush->get_osd_pool_default_crush_replicated_ruleset(cct);
+           *crush_rule = osdmap.crush->get_osd_pool_default_crush_replicated_rule(cct);
          }
          if (*crush_rule < 0) {
            // Errors may happen e.g. if no valid rule is available

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 7a70b67a16fae3f9bc8fd9a519cf09f009c3c89d..289384aea4409e6d28739197fc7fbcc9e82d90f2 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -4206,7 +4206,7 @@ int OSDMap::build_simple_optioned(CephContext *cct, epoch_t e, uuid_d &fsid,
 
   int poolbase = get_max_osd() ? get_max_osd() : 1;
 
-  const int default_replicated_rule = crush->get_osd_pool_default_crush_replicated_ruleset(cct);
+  const int default_replicated_rule = crush->get_osd_pool_default_crush_replicated_rule(cct);
   ceph_assert(default_replicated_rule >= 0);
 
   if (default_pool) {
@@ -4397,7 +4397,7 @@ int OSDMap::build_simple_crush_rules(
   const string& root,
   ostream *ss)
 {
-  int crush_rule = crush.get_osd_pool_default_crush_replicated_ruleset(cct);
+  int crush_rule = crush.get_osd_pool_default_crush_replicated_rule(cct);
   string failure_domain =
     crush.get_type_name(cct->_conf->osd_crush_chooseleaf_type);