mon: make 'osd crush unlink ..' idempotent

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 17d32915561451524dcf2878a0c12589c99f963b..e8cf2c84280de18e89944a7060b42117628c6e93 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2719,6 +2719,11 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
        } else {
          err = newcrush.remove_item(g_ceph_context, id, unlink_only);
        }
+       if (err == -ENOENT) {
+         ss << "item " << m->cmd[3] << " does not appear in that position";
+         err = 0;
+         break;
+       }
        if (err == 0) {
          pending_inc.crush.clear();
          newcrush.encode(pending_inc.crush);