From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 2 Dec 2014 06:37:15 +0000 (+0100)
Subject: tests: vstart_wrapper.sh must call vstart.sh with a list of daemons
X-Git-Tag: v0.89~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3e5741581aa2d8a2c1bc9859826f62a3b406cf0;p=ceph.git

tests: vstart_wrapper.sh must call vstart.sh with a list of daemons

The list of daemons is provided in the $CEPH_START environment variable
but vstart_wrapper.sh incorrectly uses the $VSTART_ARGS empty variable.

As a consequence vstart.sh calls init-ceph stop which kills daemons that
do not belong to the test.

http://tracker.ceph.com/issues/10215 Fixes: #10215

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh
index b71131aab702..860cb78a960a 100755
--- a/src/test/vstart_wrapper.sh
+++ b/src/test/vstart_wrapper.sh
@@ -29,7 +29,7 @@ function vstart_setup()
     export LC_ALL=C # some tests are vulnerable to i18n
     ./vstart.sh \
         -o 'paxos propose interval = 0.01' \
-        -n -l $VSTART_ARGS || return 1
+        -n -l $CEPH_START || return 1
     export PATH=.:$PATH
     export CEPH_CONF=$CEPH_DIR/ceph.conf