PG: add config to ignore history les in find_best_info

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index b13eb0982606c9b537ace1fd64a2be1338fa3fcd..9206555122179e0a29fa9aba941116afe265ff4f 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -468,6 +468,9 @@ OPTION(osd_agent_min_evict_effort, OPT_FLOAT, .1)
 OPTION(osd_agent_quantize_effort, OPT_FLOAT, .1)
 OPTION(osd_agent_delay_time, OPT_FLOAT, 5.0)
 
+// osd ignore history.last_epoch_started in find_best_info
+OPTION(osd_find_best_info_ignore_history_les, OPT_BOOL, false)
+
 // decay atime and hist histograms after how many objects go by
 OPTION(osd_agent_hist_halflife, OPT_INT, 1000)
 

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c124f7ff85973f962a3fde4860e8a2df1aecea1d..ee3903aafc87696c6dbb9b234fef9ff9509fede6 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -893,7 +893,8 @@ map<pg_shard_t, pg_info_t>::const_iterator PG::find_best_info(
   for (map<pg_shard_t, pg_info_t>::const_iterator i = infos.begin();
        i != infos.end();
        ++i) {
-    if (max_last_epoch_started_found < i->second.history.last_epoch_started) {
+    if (!cct->_conf->osd_find_best_info_ignore_history_les &&
+       max_last_epoch_started_found < i->second.history.last_epoch_started) {
       min_last_update_acceptable = eversion_t::max();
       max_last_epoch_started_found = i->second.history.last_epoch_started;
     }