From: Sage Weil <sage@inktank.com>
Date: Mon, 22 Apr 2013 19:49:58 +0000 (-0700)
Subject: mon: make 'osd pool mksnap ...' idempotent
X-Git-Tag: v0.61~127^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43d62c00c99f1cd311d44b0b0c272e6d67685256;p=ceph.git

mon: make 'osd pool mksnap ...' idempotent

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index fb4111b270e4..6000ebb80997 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3199,7 +3199,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
 	  if (p->snap_exists(snapname.c_str()) ||
 	      (pp && pp->snap_exists(snapname.c_str()))) {
 	    ss << "pool " << m->cmd[3] << " snap " << snapname << " already exists";
-	    err = -EEXIST;
+	    err = 0;
 	  } else {
 	    if (!pp) {
 	      pp = &pending_inc.new_pools[pool];