mon/PGMap: enable/disable TOO_FEW_OSDS warning with an option

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3b74fbc93d32d6cc367049d3bcbe83d3837abba5)

diff --git a/src/common/options.cc b/src/common/options.cc
index 4d42dfedc97882598ad481bb034f57776d451776..53efbdbe7c4c8aba96b30b1d419ad54311a81676 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1727,6 +1727,11 @@ std::vector<Option> get_global_options() {
     .add_service("mgr")
     .set_description("Issue a health warning if there are misplaced objects"),
 
+    Option("mon_warn_on_too_few_osds", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    .set_default(true)
+    .add_service("mgr")
+    .set_description("Issue a health warning if there are fewer OSDs than osd_pool_default_size"),
+
     Option("mon_max_snap_prune_per_epoch", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(100)
     .add_service("mon")

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 719abaafc4b44f5873e8c286858f99652f4c3daa..a108cd15206bfbcf0e57c614a347610f4acc06c9 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2695,8 +2695,9 @@ void PGMap::get_health_checks(
   }
 
   // TOO_FEW_OSDS
+  auto warn_too_few_osds = cct->_conf.get_val<bool>("mon_warn_on_too_few_osds");
   auto osd_pool_default_size = cct->_conf.get_val<uint64_t>("osd_pool_default_size");
-  if (osdmap.get_num_osds() < osd_pool_default_size) {
+  if (warn_too_few_osds && osdmap.get_num_osds() < osd_pool_default_size) {
     ostringstream ss;
     ss << "OSD count " << osdmap.get_num_osds()
         << " < osd_pool_default_size " << osd_pool_default_size;