LU-5810 tests: add client hostname to lctl mark

[fs/lustre-release.git] / lustre / tests / lockorder.sh

diff --git a/lustre/tests/lockorder.sh b/lustre/tests/lockorder.sh
index 5134a2d..c21498d 100644 (file)
--- a/lustre/tests/lockorder.sh
+++ b/lustre/tests/lockorder.sh
@@ -7,17 +7,18 @@ STATMANY=${STATMANY:-statmany}
 UNLINKMANY=${UNLINKMANY:-unlinkmany}
 LCTL=${LCTL:-lctl}
 
-MOUNT1=${MOUNT1:-/mnt/lustre1}
+MOUNT=${MOUNT:-/mnt/lustre}
 MOUNT2=${MOUNT2:-/mnt/lustre2}
-DIR=${DIR:-$MOUNT1}
+DIR=${DIR:-$MOUNT}
 DIR2=${DIR2:-$MOUNT2}
 COUNT=${COUNT:-100}
 
 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
@@ -27,12 +28,12 @@ NUM=0
 
 MINDIR=$DIR
 MAXDIR=$DIR
-MINRES=2000000000
+MINRES=4294967295
 MAXRES=0
 mkdir -p $MINDIR
 while [ $MINRES -gt $MAXRES ]; do
        FILETMP=$MINDIR/f$$${NUM}
-       DIRTMP=$MAXDIR/d$$${NUM}
+       DIRTMP=$DIR/d$$/d${NUM}
        touch $FILETMP
        mkdir -p $DIRTMP
        FILERES=`ls -id $FILETMP | awk '{ print $1 }'`
@@ -41,7 +42,7 @@ while [ $MINRES -gt $MAXRES ]; do
                MAXDIR=$DIRTMP
                MAXRES=$DIRRES
        fi
-       if [ $FILERES -lt $MINRES ]; then
+       if [ $FILERES -lt $MINRES -o -z "$MINFILE" ]; then
                [ -f "$MINFILE" ] && rm $MINFILE
                MINFILE=$FILETMP
                MINRES=$FILERES
@@ -53,15 +54,15 @@ done
 
 mv $MAXDIR $LOCKDIR
 mv $MINFILE $LOCKFILE
-rm -rf $DIR/d$$*
+rm -rf $DIR/d$$
 
-$LCTL mark "start dir: $LOCKDIR=$MAXRES file: $LOCKFILE=$MINRES"
+$LCTL mark "$HOSTNAME: start dir: $LOCKDIR=$MAXRES file: $LOCKFILE=$MINRES"
 # link will lock $LOCKFILE and $DIR as it creates ${LOCKFILE}{0,1,...}
 $CREATEMANY -l$LOCKFILE $LOCKFILE -$COUNT &
 CR_PID=$!
 
 while ! test -f ${LOCKFILE}1 ; do
-       sleep 1
+       sleep 1
 done
 
 # this will lock $DIR and ${LOCKFILE}0