From 994236b1af1d8e33177207be2845d1db28d00f43 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Wed, 8 Aug 2007 21:24:03 +0000
Subject: [PATCH] b=12499 i=Adilger i=Shadow
replay-dual, replay-single, sanityN cleanup (patchless unrelated)
---
lustre/tests/replay-dual.sh | 2 +-
lustre/tests/replay-single.sh | 6 +++++-
lustre/tests/sanityN.sh | 6 +++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 35a3c24421..5afb9151d3 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -429,7 +429,7 @@ test_18() { # bug 3822 - evicting client with enqueued lock
#define OBD_FAIL_LDLM_BL_CALLBACK 0x305
do_facet client sysctl -w lustre.fail_loc=0x80000305 # drop cb, evict
cancel_lru_locks mdc
- usleep 500 # wait to ensure first client is one that will be evicted
+ sleep 0.500s # wait to ensure first client is one that will be evicted
openfile -f O_RDONLY $MOUNT2/$tdir/f0
wait $OPENPID
dmesg | grep "entering recovery in server" && \
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index d205d1d65b..a20b50a061 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -462,7 +462,7 @@ test_20b() { # bug 10480
dd if=/dev/zero of=$DIR/$tfile bs=4k count=10000 &
pid=$!
while [ ! -e $DIR/$tfile ] ; do
- usleep 60 # give dd a chance to start
+ sleep 0.060s # give dd a chance to start
done
lfs getstripe $DIR/$tfile || return 1
@@ -888,6 +888,10 @@ run_test 40 "cause recovery in ptlrpc, ensure IO continues"
# the page, guarnateeing that the unlock from the RPC completion would
# assert on trying to unlock the unlocked page.
test_41() {
+ [ $OSTCOUNT -lt 2 ] && \
+ echo "skipping test 41: we don't have a second OST to test with" && \
+ return
+
local f=$MOUNT/$tfile
# make sure the start of the file is ost1
lfs setstripe $f $((128 * 1024)) 0 0
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 0e1a9bccda..e268ce21d4 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -411,7 +411,7 @@ test_11() {
mkdir $DIR1/d11
multiop $DIR1/d11/f O_c &
MULTIPID=$!
- usleep 200
+ sleep 0.200s
cp -p /bin/ls $DIR1/d11/f
$DIR2/d11/f
RC=$?
@@ -713,7 +713,7 @@ test_27() {
lctl clear
dd if=/dev/zero of=$DIR2/$tfile bs=$((4096+4))k conv=notrunc count=4 seek=3 &
DD2_PID=$!
- usleep 50
+ sleep 0.050s
log "dd 1 started"
dd if=/dev/zero of=$DIR1/$tfile bs=$((16384-1024))k conv=notrunc count=1 seek=4 &
@@ -771,7 +771,7 @@ test_29() { # bug 10999
#define OBD_FAIL_LDLM_GLIMPSE 0x30f
sysctl -w lustre.fail_loc=0x8000030f
ls -l $DIR2/$tfile &
- usleep 500
+ sleep 0.500s
dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1
wait
}
--
GitLab