From: Loic Dachary <loic@dachary.org>
Date: Thu, 16 Jan 2014 13:29:46 +0000 (+0100)
Subject: mon: larger timeout for mon mkfs.sh test
X-Git-Tag: v0.78~303^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1082%2Fhead;p=ceph.git

mon: larger timeout for mon mkfs.sh test

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/mon/mkfs.sh b/src/test/mon/mkfs.sh
index a3f139728c1..33e3fbafefb 100755
--- a/src/test/mon/mkfs.sh
+++ b/src/test/mon/mkfs.sh
@@ -24,6 +24,7 @@ MON_ID=a
 MON_DIR=$DIR/$MON_ID
 PORT=7451
 MONA=127.0.0.1:$PORT
+TIMEOUT=360
 
 function setup() {
     teardown
@@ -84,7 +85,7 @@ function auth_none() {
 
     mon_run --auth-supported=none
     
-    timeout 10 ./ceph --mon-host $MONA mon stat || return 1
+    timeout $TIMEOUT ./ceph --mon-host $MONA mon stat || return 1
 }
 
 function auth_cephx_keyring() {
@@ -100,7 +101,7 @@ EOF
 
     mon_run
 
-    timeout 10 ./ceph \
+    timeout $TIMEOUT ./ceph \
         --name mon. \
         --keyring $MON_DIR/keyring \
         --mon-host $MONA mon stat || return 1
@@ -122,7 +123,7 @@ function auth_cephx_key() {
 
     mon_run
 
-    timeout 10 ./ceph \
+    timeout $TIMEOUT ./ceph \
         --name mon. \
         --keyring $MON_DIR/keyring \
         --mon-host $MONA mon stat || return 1