From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Aug 2019 17:28:31 +0000 (-0500)
Subject: qa/standalone/mon/health-mute.sh: fix up rachet test
X-Git-Tag: v15.1.0~1815^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e36be9567a65c69032bee4505ccb10b6b44afc8;p=ceph.git

qa/standalone/mon/health-mute.sh: fix up rachet test

Make sure we provide time for the mute to get cleared out by tick().

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/mon/health-mute.sh b/qa/standalone/mon/health-mute.sh
index 4e1b10be340b..226d6ab31fa0 100755
--- a/qa/standalone/mon/health-mute.sh
+++ b/qa/standalone/mon/health-mute.sh
@@ -75,20 +75,33 @@ function TEST_mute() {
     ceph osd down 0 1
     ceph -s
     ceph health detail | grep OSD_DOWN || return 1
+
     ceph health mute OSD_DOWN
     kill_daemons $dir TERM osd.0
     ceph osd unset noup
+    sleep 10
     ceph -s
     ceph health detail | grep OSD_DOWN || return 1
+    ceph health detail | grep '1 osds down' || return 1
     ceph health | grep HEALTH_OK || return 1
-    sleep 10
+
+    sleep 10 # give time for mon tick to rachet the mute
     ceph osd set noup
     ceph health mute OSDMAP_FLAGS
     ceph -s
+    ceph health detail
     ceph health | grep HEALTH_OK || return 1
+
     ceph osd down 1
     ceph -s
+    ceph health detail
+    ceph health detail | grep '2 osds down' || return 1
+
+    sleep 10 # give time for mute to clear
+    ceph -s
+    ceph health detail
     ceph health | grep HEALTH_WARN || return 1
+    ceph health detail | grep '2 osds down' || return 1
 
     teardown $dir || return 1
 }