Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch head
[fs/lustre-release.git]
/
lustre
/
tests
/
lockorder.sh
diff --git
a/lustre/tests/lockorder.sh
b/lustre/tests/lockorder.sh
index
1678a39
..
162df9a
100644
(file)
--- a/
lustre/tests/lockorder.sh
+++ b/
lustre/tests/lockorder.sh
@@
-1,7
+1,7
@@
#!/bin/sh
set -e
#!/bin/sh
set -e
-export PATH=`dirname $0`:$PATH
+export PATH=`dirname $0`:
`dirname $0`/../utils:
$PATH
CREATEMANY=${CREATEMANY:-createmany}
STATMANY=${STATMANY:-statmany}
UNLINKMANY=${UNLINKMANY:-unlinkmany}
CREATEMANY=${CREATEMANY:-createmany}
STATMANY=${STATMANY:-statmany}
UNLINKMANY=${UNLINKMANY:-unlinkmany}
@@
-15,9
+15,10
@@
COUNT=${COUNT:-100}
cleanup() {
[ $CR_PID ] && kill -9 $CR_PID
cleanup() {
[ $CR_PID ] && kill -9 $CR_PID
+ [ $ST_PID ] && kill -9 $ST_PID
}
}
-trap cleanup
0
+trap cleanup
EXIT
LOCKDIR=$DIR/lockdir
LOCKFILE=$LOCKDIR/lockfile
LOCKDIR=$DIR/lockdir
LOCKFILE=$LOCKDIR/lockfile
@@
-46,7
+47,7
@@
while [ $MINRES -gt $MAXRES ]; do
MINFILE=$FILETMP
MINRES=$FILERES
else
MINFILE=$FILETMP
MINRES=$FILERES
else
- rm $
TMPFILE
+ rm $
FILETMP
fi
NUM=$(($NUM + 1))
done
fi
NUM=$(($NUM + 1))
done
@@
-60,7
+61,9
@@
$LCTL mark "start dir: $LOCKDIR=$MAXRES file: $LOCKFILE=$MINRES"
$CREATEMANY -l$LOCKFILE $LOCKFILE -$COUNT &
CR_PID=$!
$CREATEMANY -l$LOCKFILE $LOCKFILE -$COUNT &
CR_PID=$!
-sleep 1
+while ! test -f ${LOCKFILE}1 ; do
+ sleep 1
+done
# this will lock $DIR and ${LOCKFILE}0
$STATMANY -s $DIR2/lockdir/lockfile 1 -$COUNT &
# this will lock $DIR and ${LOCKFILE}0
$STATMANY -s $DIR2/lockdir/lockfile 1 -$COUNT &
@@
-74,4
+77,4
@@
trap 0
kill $CR_PID || true
kill $ST_PID || true
kill $CR_PID || true
kill $ST_PID || true
-
#rm -r $P
DIR
+
rm -rf $LOCK
DIR