From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 6 Jun 2017 00:56:31 +0000 (-0700)
Subject: pgmap: extend mon_pg_warn_min_objects to cover the PG-per-OSD warnings too
X-Git-Tag: ses5-milestone8~1^2~21^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae06a6aee7ab5faca72a1419b78cf85b34d916c8;p=ceph.git

pgmap: extend mon_pg_warn_min_objects to cover the PG-per-OSD warnings too

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 1ab34f253cb4..0f0dff32f9ce 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2871,6 +2871,10 @@ void PGMap::get_health(
   // pg skew
   int num_in = osdmap.get_num_in_osds();
   int sum_pg_up = MAX(pg_sum.up, static_cast<int32_t>(pg_stat.size()));
+  int sum_objects = pg_sum.stats.sum.num_objects;
+  if (sum_objects < cct->_conf->mon_pg_warn_min_objects) {
+    return;
+  }
   if (num_in && cct->_conf->mon_pg_warn_min_per_osd > 0) {
     int per = sum_pg_up / num_in;
     if (per < cct->_conf->mon_pg_warn_min_per_osd && per) {