From 1810a17e23031a34232d70eb0cea79d2020e34e0 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 19 Apr 2017 22:42:01 -0700 Subject: [PATCH] mon: Fix incorrect health output and test code to match Signed-off-by: David Zafman --- qa/workunits/cephtool/test.sh | 2 +- src/mon/OSDMonitor.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index df52783bfe9..d56503c72b3 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 554ba3a575b..2b250bfebbb 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3419,7 +3419,7 @@ void OSDMonitor::get_health(list >& 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; -- 2.39.5