]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: ceph-disk.sh: do not kill all daemons
authorKefu Chai <kchai@redhat.com>
Tue, 19 Jul 2016 08:04:18 +0000 (16:04 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 19 Jul 2016 08:30:24 +0000 (16:30 +0800)
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>
src/ceph-disk/tests/ceph-disk.sh

index 3346b9966b484eb27f02e0d11dba3ef89e0d4ed3..e685caff027e0710a24baadbe6567b4c7951a5b6 100755 (executable)
@@ -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