]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: vstart_wrapper.sh must call vstart.sh with a list of daemons
authorLoic Dachary <ldachary@redhat.com>
Tue, 2 Dec 2014 06:37:15 +0000 (07:37 +0100)
committerLoic Dachary <ldachary@redhat.com>
Tue, 2 Dec 2014 22:52:48 +0000 (23:52 +0100)
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>
src/test/vstart_wrapper.sh

index b71131aab702f477de6335f1b3e94f6cc69122f0..860cb78a960a388413bcae549d09e76bd32608ea 100755 (executable)
@@ -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