From: David Zafman <dzafman@redhat.com>
Date: Thu, 3 Dec 2015 22:52:24 +0000 (-0800)
Subject: osd: Test osd_find_best_info_ignore_history_les config in another assert
X-Git-Tag: v0.94.6~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7177%2Fhead;p=ceph.git

osd: Test osd_find_best_info_ignore_history_les config in another assert

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 02a9a41f151a3d968bf8066749658659dc6e3ac4)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index df5b34d3f4b..8515f94280f 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -285,7 +285,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);
 }