From: Loic Dachary <loic@dachary.org>
Date: Tue, 14 Jan 2014 09:18:15 +0000 (+0100)
Subject: ceph-disk: larger timeout in the test script
X-Git-Tag: v0.76~5^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f5e4f5250d49c1624f8773985eff06c6577578d;p=ceph.git

ceph-disk: larger timeout in the test script

Otherwise slow machines may timeout just because they are slow and not
because the process is blocked by an actual problem.

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

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index e4976bca4061..a8a365ff250c 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -35,6 +35,7 @@ CEPH_DISK_ARGS+=" --statedir=$DIR"
 CEPH_DISK_ARGS+=" --sysconfdir=$DIR"
 CEPH_DISK_ARGS+=" --prepend-to-path="
 CEPH_DISK_ARGS+=" --verbose"
+TIMEOUT=360
 
 function setup() {
     teardown
@@ -178,17 +179,17 @@ function test_activate_dir() {
         prepare $osd_data || return 1
 
     CEPH_ARGS="$CEPH_ARGS --osd-journal-size=100 --osd-data=$osd_data" \
-        timeout 5 ./ceph-disk $CEPH_DISK_ARGS \
+        timeout $TIMEOUT ./ceph-disk $CEPH_DISK_ARGS \
                       activate \
                      --mark-init=none \
                     $osd_data || return 1
-    timeout 5 ./ceph osd pool set data size 1 || return 1
+    timeout $TIMEOUT ./ceph osd pool set data size 1 || return 1
     local id=$(cat $osd_data/whoami)
     local weight=1
     ./ceph osd crush add osd.$id $weight root=default host=localhost || return 1
     echo FOO > $DIR/BAR
-    timeout 10 ./rados --pool data put BAR $DIR/BAR || return 1
-    timeout 10 ./rados --pool data get BAR $DIR/BAR.copy || return 1
+    timeout $TIMEOUT ./rados --pool data put BAR $DIR/BAR || return 1
+    timeout $TIMEOUT ./rados --pool data get BAR $DIR/BAR.copy || return 1
     diff $DIR/BAR $DIR/BAR.copy || return 1
 }