From: Sage Weil <sage@redhat.com>
Date: Fri, 10 May 2019 19:45:12 +0000 (-0500)
Subject: mon/PGMap: enable/disable TOO_FEW_OSDS warning with an option
X-Git-Tag: v15.1.0~2607^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b74fbc93d32d6cc367049d3bcbe83d3837abba5;p=ceph.git

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

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

diff --git a/src/common/options.cc b/src/common/options.cc
index 310aa0474f85..ebd6108b7fd4 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1605,6 +1605,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 d3caa7c58d78..f8c3bcbd693c 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2693,8 +2693,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;