mon/MDSMonitor: make 'ceph mds remove_data_pool ...' idempotent

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

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 1865a845af3581d95e8a0dedf36a38f50080c25a..811cdf03b7fffb9a55190eb6deca07fbac7d2aca 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -937,6 +937,8 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
     int64_t poolid;
     cmd_getval(g_ceph_context, cmdmap, "poolid", poolid);
     r = pending_mdsmap.remove_data_pool(poolid);
+    if (r == -ENOENT)
+      r = 0;
     if (r == 0)
       ss << "removed data pool " << poolid << " from mdsmap";