From: David Zafman <dzafman@redhat.com>
Date: Thu, 20 Apr 2017 05:42:01 +0000 (-0700)
Subject: mon: Fix incorrect health output and test code to match
X-Git-Tag: v12.0.3~321^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1810a17e23031a34232d70eb0cea79d2020e34e0;p=ceph.git

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 df52783bfe9a..d56503c72b3f 100755
--- 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 554ba3a575b5..2b250bfebbb7 100644
--- 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;