]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Test osd_find_best_info_ignore_history_les config in another assert 6793/head
authorDavid Zafman <dzafman@redhat.com>
Thu, 3 Dec 2015 22:52:24 +0000 (14:52 -0800)
committerDavid Zafman <dzafman@redhat.com>
Fri, 4 Dec 2015 01:33:18 +0000 (17:33 -0800)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/PG.cc

index 392097e27e87302512cbe2a184acc577aae751bc..4f7c90b26671b03227f218722c67b25bbef64305 100644 (file)
@@ -293,7 +293,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);
 }