From d23210c2f9331f3b41ee326244afade08a83609e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 25 Jun 2021 15:41:35 -0400 Subject: [PATCH] mon/OSDMonitor: rule, not ruleset Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 7cf85679cbf..872e5749f41 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -7362,7 +7362,7 @@ int OSDMonitor::crush_rule_create_erasure(const string &name, { int ruleid = osdmap.crush->get_rule_id(name); if (ruleid != -ENOENT) { - *rule = osdmap.crush->get_rule_mask_ruleset(ruleid); + *rule = ruleid; return -EEXIST; } @@ -7370,7 +7370,7 @@ int OSDMonitor::crush_rule_create_erasure(const string &name, ruleid = newcrush.get_rule_id(name); if (ruleid != -ENOENT) { - *rule = newcrush.get_rule_mask_ruleset(ruleid); + *rule = ruleid; return -EALREADY; } else { ErasureCodeInterfaceRef erasure_code; @@ -7739,7 +7739,7 @@ int OSDMonitor::prepare_pool_crush_rule(const unsigned pool_type, return -EINVAL; } } else { - if (!osdmap.crush->ruleset_exists(*crush_rule)) { + if (!osdmap.crush->rule_exists(*crush_rule)) { *ss << "CRUSH rule " << *crush_rule << " not found"; return -ENOENT; } @@ -11102,9 +11102,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, // make sure it is not in use. // FIXME: this is ok in some situations, but let's not bother with that // complexity now. - int ruleset = newcrush.get_rule_mask_ruleset(ruleno); - if (osdmap.crush_rule_in_use(ruleset)) { - ss << "crush ruleset " << name << " " << ruleset << " is in use"; + if (osdmap.crush_rule_in_use(ruleno)) { + ss << "crush rule " << name << " (" << ruleno << ") is in use"; err = -EBUSY; goto reply; } -- 2.39.5