From 48a71a737f067344d1b911ce4358b04d365781a7 Mon Sep 17 00:00:00 2001 From: Xinze Chi Date: Fri, 20 Nov 2015 20:59:35 +0800 Subject: [PATCH] mon: do not ignore a failure report cancellation form osd do not ignore a failure report cancellation form osd even if it is down. Signed-off-by: Xinze Chi --- src/mon/OSDMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index c3c684f6ce5d..f3e970399c78 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1429,7 +1429,7 @@ bool OSDMonitor::preprocess_failure(MonOpRequestRef op) int from = m->get_orig_source().num(); if (!osdmap.exists(from) || osdmap.get_addr(from) != m->get_orig_source_inst().addr || - osdmap.is_down(from)) { + (osdmap.is_down(from) && m->if_osd_failed())) { dout(5) << "preprocess_failure from dead osd." << from << ", ignoring" << dendl; send_incremental(op, m->get_epoch()+1); goto didit; -- 2.47.3