From: Sage Weil <sage@redhat.com>
Date: Fri, 16 Nov 2018 17:00:52 +0000 (-0600)
Subject: mon: add mon_warn_on_misplaced option
X-Git-Tag: v14.1.0~874^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4a65456ce958a762bc3946a9f7bdb31d6df83e8;p=ceph.git

mon: add mon_warn_on_misplaced option

Control whether we issue HEALTH_WARN due to misplaced objects.

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 b85d7147b5e4..2ee8f85936c8 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -257,6 +257,7 @@ OPTION(mon_crush_min_required_version, OPT_STR)
 OPTION(mon_warn_on_crush_straw_calc_version_zero, OPT_BOOL) // warn if crush straw_calc_version==0
 OPTION(mon_warn_on_osd_down_out_interval_zero, OPT_BOOL) // warn if 'mon_osd_down_out_interval == 0'
 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)
diff --git a/src/common/options.cc b/src/common/options.cc
index 3e817a54fe3b..31c5a57600c6 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1523,6 +1523,10 @@ std::vector<Option> get_global_options() {
     .set_default(true)
     .set_description("Enable POOL_APP_NOT_ENABLED health check"),
 
+    Option("mon_warn_on_misplaced", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    .set_default(true)
+    .set_description("Issue a health warning if there are misplaced objects"),
+
     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 99551a2b40be..6632433bc71c 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2732,7 +2732,8 @@ void PGMap::get_health_checks(
 
   // OBJECT_MISPLACED
   if (pg_sum.stats.sum.num_objects_misplaced &&
-      pg_sum.stats.sum.num_object_copies > 0) {
+      pg_sum.stats.sum.num_object_copies > 0 &&
+      cct->_conf->mon_warn_on_misplaced) {
     double pc = (double)pg_sum.stats.sum.num_objects_misplaced /
       (double)pg_sum.stats.sum.num_object_copies * (double)100.0;
     char b[20];