mon: Fix incorrect health output and test code to match

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index df52783bfe9af2037882cf744d7b27a92828092d..d56503c72b3fdc43d3cfe78dbee03f2e266ddccd 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1452,7 +1452,7 @@ function test_mon_pg()
   # Check health status
   ceph osd set-nearfull-ratio .913
   ceph health | grep 'HEALTH_ERR.*Full ratio(s) out of order'
-  ceph health detail | grep 'backfill_ratio (0.912) < nearfull_ratio (0.913), increased'
+  ceph health detail | grep 'backfillfull_ratio (0.912) < nearfull_ratio (0.913), increased'
   ceph osd set-nearfull-ratio .892
   ceph osd set-backfillfull-ratio .963
   ceph health detail | grep 'full_ratio (0.962) < backfillfull_ratio (0.963), increased'

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 554ba3a575b52b134d7c4582c94e4f61db9efaf9..2b250bfebbb7b7137deac4f98a27859f1c68053a 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3419,7 +3419,7 @@ void OSDMonitor::get_health(list<pair<health_status_t,string> >& summary,
         out_of_order = true;
         if (detail) {
          ostringstream ss;
-         ss << "backfill_ratio (" << br << ") < nearfull_ratio (" << nr << "), increased";
+         ss << "backfillfull_ratio (" << br << ") < nearfull_ratio (" << nr << "), increased";
          detail->push_back(make_pair(HEALTH_ERR, ss.str()));
         }
         br = nr;