From: Sage Weil <sage@inktank.com>
Date: Wed, 24 Jul 2013 00:14:02 +0000 (-0700)
Subject: mon/MonmapMonitor: make 'mon remove ...' idempotent
X-Git-Tag: v0.67-rc2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4183b74b00b5cddcac3d0de96cff231162f1fe3c;p=ceph.git

mon/MonmapMonitor: make 'mon remove ...' idempotent

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

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 195f66350d88..5ec1583b82f6 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -322,8 +322,8 @@ bool MonmapMonitor::prepare_command(MMonCommand *m)
     string name;
     cmd_getval(g_ceph_context, cmdmap, "name", name);
     if (!pending_map.contains(name)) {
-      err = -ENOENT;
-      ss << "mon " << name << " does not exist";
+      err = 0;
+      ss << "mon " << name << " does not exist or has already been removed";
       goto out;
     }