From: David Zafman <dzafman@redhat.com>
Date: Fri, 7 Jul 2017 17:53:41 +0000 (-0700)
Subject: mon: Fix status output warning for mon_warn_osd_usage_min_max_delta
X-Git-Tag: v11.2.1~18^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c6542ac7e6408f26ce7376d3a58eed0661a17099;p=ceph.git

mon: Fix status output warning for mon_warn_osd_usage_min_max_delta

Fixes: http://tracker.ceph.com/issues/20544

Caued by: 489e810c37ed6fb9d32d1015634041a577501ee4

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 56f9808016ab289bdc0ce7cfbb0503c78b509593)

Conflicts:
    src/mon/PGMap.cc:
        kraken has no daa0793c393a21bd2dd2ec52a0efd181e1032400 so we manually
        apply the changes from 56f9808016ab289bdc0ce7cfbb0503c78b509593 to
        src/mon/PGMonitor.cc instead of to src/mon/PGMap.cc
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 5e5644daf8839..5b36af5a8f31a 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1811,11 +1811,11 @@ void PGMonitor::get_health(list<pair<health_status_t,string> >& summary,
     float diff = max_osd_usage - min_osd_usage;
     if (diff > g_conf->mon_warn_osd_usage_min_max_delta) {
       ostringstream ss;
-      ss << "difference between min (" << roundf(min_osd_usage*1000.0)/100.0
-	 << "%) and max (" << roundf(max_osd_usage*1000.0)/100.0
-	 << "%) osd usage " << roundf(diff*1000.0)/100.0 << "% > "
-	 << roundf(g_conf->mon_warn_osd_usage_min_max_delta*1000.0)/100.0
-	 << " (mon_warn_osd_usage_min_max_delta)";
+      ss << "difference between min (" << roundf(min_osd_usage*1000.0)/10.0
+         << "%) and max (" << roundf(max_osd_usage*1000.0)/10.0
+         << "%) osd usage " << roundf(diff*1000.0)/10.0 << "% > "
+         << roundf(cct->_conf->mon_warn_osd_usage_min_max_delta*1000.0)/10.0
+         << "% (mon_warn_osd_usage_min_max_delta)";
       summary.push_back(make_pair(HEALTH_WARN, ss.str()));
       if (detail)
         detail->push_back(make_pair(HEALTH_WARN, ss.str()));