From: Kefu Chai <kchai@redhat.com>
Date: Tue, 19 Jul 2016 08:04:18 +0000 (+0800)
Subject: test: ceph-disk.sh: do not kill all daemons
X-Git-Tag: ses5-milestone5~367^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=700db8e80a981078445fcb70caf27f80db6c359a;p=ceph.git

test: ceph-disk.sh: do not kill all daemons

this causes mysterious "racing" issues when running ceph-helper tests in
parallel.

Fixes: http://tracker.ceph.com/issues/16729
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
index 3346b9966b48..e685caff027e 100755
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -58,7 +58,7 @@ function teardown() {
     if ! test -e $dir ; then
         return
     fi
-    kill_daemons
+    kill_daemons $dir
     if [ $(stat -f -c '%T' .) == "btrfs" ]; then
         rm -fr $dir/*/*db
         __teardown_btrfs $dir