From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Nov 2017 19:43:06 +0000 (-0600)
Subject: osd: remove obsolete osd_map_max_advance option
X-Git-Tag: v13.0.2~840^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8967b739a1b741ed81955dc8303da37cd47007ca;p=ceph.git

osd: remove obsolete osd_map_max_advance option

We now always advance to the latest map epoch at once.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 22d62ab4705..ec32f3d2556 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -621,7 +621,6 @@ OPTION(osd_tier_promote_max_bytes_sec, OPT_U64)
 OPTION(osd_objecter_finishers, OPT_INT)
 
 OPTION(osd_map_dedup, OPT_BOOL)
-OPTION(osd_map_max_advance, OPT_INT) // make this < cache_size!
 OPTION(osd_map_cache_size, OPT_INT)
 OPTION(osd_map_message_max, OPT_INT)  // max maps per MOSDMap message
 OPTION(osd_map_share_max_epochs, OPT_INT)  // cap on # of inc maps we send to peers, clients
diff --git a/src/common/options.cc b/src/common/options.cc
index bc8ca9c42f7..2b311db7b93 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1899,10 +1899,6 @@ std::vector<Option> get_global_options() {
     .set_default(true)
     .set_description(""),
 
-    Option("osd_map_max_advance", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(40)
-    .set_description(""),
-
     Option("osd_map_cache_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(50)
     .set_description(""),
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 24c99f77a14..c01b14a353f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -9275,7 +9275,6 @@ const char** OSD::get_tracked_conf_keys() const
     "osd_op_history_slow_op_threshold",
     "osd_enable_op_tracker",
     "osd_map_cache_size",
-    "osd_map_max_advance",
     "osd_pg_epoch_persisted_max_stale",
     "osd_disk_thread_ioprio_class",
     "osd_disk_thread_ioprio_priority",
@@ -9410,11 +9409,6 @@ void OSD::update_log_config()
 void OSD::check_config()
 {
   // some sanity checks
-  if (cct->_conf->osd_map_cache_size <= cct->_conf->osd_map_max_advance + 2) {
-    clog->warn() << "osd_map_cache_size (" << cct->_conf->osd_map_cache_size << ")"
-		<< " is not > osd_map_max_advance ("
-		<< cct->_conf->osd_map_max_advance << ")";
-  }
   if (cct->_conf->osd_map_cache_size <= (int)cct->_conf->osd_pg_epoch_persisted_max_stale + 2) {
     clog->warn() << "osd_map_cache_size (" << cct->_conf->osd_map_cache_size << ")"
 		 << " is not > osd_pg_epoch_persisted_max_stale ("