From: David Zafman <dzafman@redhat.com>
Date: Thu, 20 Apr 2017 06:20:22 +0000 (-0700)
Subject: /workunits/cephtool/test.sh: Improve testing of health-output.
X-Git-Tag: v12.0.3~321^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86fea9d539b189aef3f04b92de4e7bf9c816846d;p=ceph.git

/workunits/cephtool/test.sh: Improve testing of health-output.

Instead of 9ff401e65b1a66a320953aeef8ab65b6f1fb6f10 use regex to handle:
       HEALTH_ERR 2 pgs stuck unclean; Full ratio(s) out of order

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

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index fc58e4380808..df52783bfe9a 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1451,7 +1451,7 @@ function test_mon_pg()
 
   # Check health status
   ceph osd set-nearfull-ratio .913
-  ceph health | grep 'ratio(s) out of order'
+  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 osd set-nearfull-ratio .892
   ceph osd set-backfillfull-ratio .963