Skip to content

Commit

Permalink
ceph-disk: larger timeout in the test script
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Loic Dachary committed Jan 30, 2014
1 parent 1a1f53d commit 3f5e4f5
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/test/ceph-disk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down

0 comments on commit 3f5e4f5

Please sign in to comment.