RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 00:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1082 from dachary/wip-ceph-disk

Browse Source 
ceph-disk: larger timeout in the test script

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-01-17 11:59:00 -08:00
commit 7f61d2492f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/ceph-disk.sh
View File

@ -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
}

7
src/test/mon/mkfs.sh
View File

@ -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