From 5ef86d78f86c8feeae5bade408ce03bd3b86573c Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 3 Dec 2015 14:52:24 -0800 Subject: [PATCH] osd: Test osd_find_best_info_ignore_history_les config in another assert Signed-off-by: David Zafman (cherry picked from commit 02a9a41f151a3d968bf8066749658659dc6e3ac4) --- src/osd/PG.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index c13321c7b37ab..11a2bfb34c653 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -292,7 +292,8 @@ void PG::proc_master_log( if (oinfo.last_epoch_started > info.last_epoch_started) info.last_epoch_started = oinfo.last_epoch_started; info.history.merge(oinfo.history); - assert(info.last_epoch_started >= info.history.last_epoch_started); + assert(cct->_conf->osd_find_best_info_ignore_history_les || + info.last_epoch_started >= info.history.last_epoch_started); peer_missing[from].swap(omissing); } -- 2.39.5