From 4183b74b00b5cddcac3d0de96cff231162f1fe3c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Tue, 23 Jul 2013 17:14:02 -0700
Subject: [PATCH] mon/MonmapMonitor: make 'mon remove ...' idempotent

Signed-off-by: Sage Weil <sage@inktank.com>
---
 src/mon/MonmapMonitor.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 195f66350d88e..5ec1583b82f6b 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;
     }
 
-- 
2.39.5