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: v13.2.7~156^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=72a66e7b4c16dd6164a26a02402bf364195d91cf;p=ceph.git

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

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

Conflicts
        src/mon/PGMap.cc
- cct->_conf->get_val in mimic
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 5f2c4e03a352..e9a31204c8b9 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1463,6 +1463,11 @@ std::vector<Option> get_global_options() {
     .set_default(true)
     .set_description("Enable POOL_APP_NOT_ENABLED health check"),
 
+    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)
     .set_description("Max number of pruned snaps we will process in a single OSDMap epoch"),
diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index b7156c0e81ef..a0a4778f4236 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2570,8 +2570,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;