From: Loic Dachary <loic@dachary.org>
Date: Sun, 9 Feb 2014 17:26:57 +0000 (+0100)
Subject: mon: minor improvement to test-helpers.sh
X-Git-Tag: v0.78~184^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd13307f639af89a79aba09f4c1b5503579adff1;p=ceph.git

mon: minor improvement to test-helpers.sh

* kill -9 daemons to better cope with stuck daemons
* reduce paxos propose interval to speedup tests
* look for erasure code plugins from the sources directory

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

diff --git a/src/test/mon/mon-test-helpers.sh b/src/test/mon/mon-test-helpers.sh
index 63360c92807..0196bd9dd08 100644
--- a/src/test/mon/mon-test-helpers.sh
+++ b/src/test/mon/mon-test-helpers.sh
@@ -41,8 +41,12 @@ function run_mon() {
 
     ./ceph-mon \
         --id $id \
+        --paxos-propose-interval=0.1 \
+        --osd-pool-default-erasure-code-directory=.libs \
         --debug-mon 20 \
         --debug-ms 20 \
+        --debug-paxos 20 \
+        --mon-advanced-debug-mode \
         --chdir= \
         --mon-data=$dir \
         --log-file=$dir/log \
@@ -56,7 +60,7 @@ function kill_daemons() {
     local dir=$1
     for pidfile in $(find $dir | grep pidfile) ; do
         for try in 0 1 1 1 2 3 ; do
-            kill $(cat $pidfile 2> /dev/null) 2> /dev/null || break
+            kill -9 $(cat $pidfile 2> /dev/null) 2> /dev/null || break
             sleep $try
         done
     done
@@ -69,9 +73,8 @@ function main() {
     export CEPH_CONF=/dev/null
     unset CEPH_ARGS
 
-    setup $dir || return 1
     set -x
+    setup $dir || return 1
     run $dir || return 1
-    set +x
     teardown $dir || return 1
 }