From: Sage Weil <sage@redhat.com>
Date: Sun, 9 Dec 2018 16:15:05 +0000 (-0600)
Subject: common/options: kill old mon_max_pgmap_epochs option
X-Git-Tag: v14.1.0~594^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0825b756e6ac4419cce71828411e02ad04c5c5cf;p=ceph.git

common/options: kill old mon_max_pgmap_epochs option

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 a5064a15de38..d9600d94055e 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -257,7 +257,6 @@ OPTION(mon_warn_on_osd_down_out_interval_zero, OPT_BOOL) // warn if 'mon_osd_dow
 OPTION(mon_warn_on_cache_pools_without_hit_sets, OPT_BOOL)
 OPTION(mon_warn_on_misplaced, OPT_BOOL)
 OPTION(mon_min_osdmap_epochs, OPT_INT)
-OPTION(mon_max_pgmap_epochs, OPT_INT)
 OPTION(mon_max_log_epochs, OPT_INT)
 OPTION(mon_max_mdsmap_epochs, OPT_INT)
 OPTION(mon_max_osd, OPT_INT)
diff --git a/src/common/options.cc b/src/common/options.cc
index 6cd10a1f8f93..e87536837e94 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1566,11 +1566,7 @@ std::vector<Option> get_global_options() {
 
     Option("mon_min_osdmap_epochs", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(500)
-    .set_description(""),
-
-    Option("mon_max_pgmap_epochs", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(500)
-    .set_description(""),
+    .set_description("min number of OSDMaps to store"),
 
     Option("mon_max_log_epochs", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(500)