From e6d4582a68f3efa0907dfa5945a9adceeb6d1319 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 3 Apr 2013 15:04:00 -0700 Subject: [PATCH] mon: make 'osd crush unlink ..' idempotent Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 17d32915561..e8cf2c84280 100644 --- 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); -- 2.47.3