From b0c1001a5e29c9cc4465497b3cac06db89ddccb2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Apr 2013 11:19:56 -0700 Subject: [PATCH] mon: ensure 'osd crush rule ...' commands are idempotent Ensure that we return 0 for these cases. Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index ec15d0abd288..8868189446de 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2813,6 +2813,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) if (newcrush.rule_exists(name)) { ss << "rule " << name << " already exists"; + err = 0; } else { int rule = newcrush.add_simple_rule(name, root, type); if (rule < 0) { @@ -2844,6 +2845,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) if (!newcrush.rule_exists(name)) { ss << "rule " << name << " does not exist"; + err = 0; } else { int ruleno = newcrush.get_rule_id(name); assert(ruleno >= 0); -- 2.47.3