From: Sage Weil <sage@inktank.com>
Date: Thu, 18 Apr 2013 18:19:56 +0000 (-0700)
Subject: mon: ensure 'osd crush rule ...' commands are idempotent
X-Git-Tag: v0.61~143^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F224%2Fhead;p=ceph.git

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 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);