qa/workunits/rbd: avoid unnecessary sleeping in stop_mirror()

There is no need to wait for anything if -KILL is passed for sig
because the process would disappear immediately.  In teuthology runs
where multiple rbd-mirror daemons are deployed (and therefore need to
be stopped when stop_mirrors() is called by the test), it causes
gratuitous delays of 4+ seconds.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit f18fe5d15f72e34ab74b8ae187a47b52883fc780)

diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh
index 7aa9639f12b5c1fd3b20c6817122a30437c2f191..9b82d088bc265dc418e835c10ef5db7d3a9a2650 100755 (executable)
--- a/qa/workunits/rbd/rbd_mirror_helpers.sh
+++ b/qa/workunits/rbd/rbd_mirror_helpers.sh
@@ -451,10 +451,9 @@ stop_mirror()
 
     local pid
     pid=$(cat $(daemon_pid_file "${cluster}") 2>/dev/null) || :
-    if [ -n "${pid}" ]
-    then
+    if [ -n "${pid}" ]; then
         kill ${sig} ${pid}
-        for s in 1 2 4 8 16 32; do
+        for s in 0 1 2 4 8 16 32; do
             sleep $s
             ps auxww | awk -v pid=${pid} '$2 == pid {print; exit 1}' && break
         done