mon: ensure 'osd crush rule ...' commands are idempotent

Ensure that we return 0 for these cases.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ec15d0abd288db66dc5ff2a261c16e6a26fa8381..8868189446debf2b3a74f9ac30a2557b05f406df 100644 (file)
--- 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);