LU-613 clio: Client dead-lock during binary exec

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

diff --git a/lustre/tests/racer/racer.sh b/lustre/tests/racer/racer.sh
index 645e349..216e56f 100755 (executable)
--- a/lustre/tests/racer/racer.sh
+++ b/lustre/tests/racer/racer.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+#set -x
 
 MAX_FILES=${MAX_FILES:-20}
 DIR=${DIR:-$1}
@@ -10,43 +11,66 @@ NUM_THREADS=${NUM_THREADS:-3}
 
 mkdir -p $DIR
 
+RACER_PROGS="file_create dir_create file_rm file_rename file_link file_symlink \
+file_list file_concat file_exec"
+
 racer_cleanup()
 {
-    killall file_create.sh 
-    killall dir_create.sh
-    killall file_rm.sh 
-    killall file_rename.sh 
-    killall file_link.sh 
-    killall file_symlink.sh 
-    killall file_list.sh 
-    killall file_concat.sh
-    trap 0
+       echo "racer cleanup"
+       for P in $RACER_PROGS; do
+               killall $P.sh
+       done
+       trap 0
+
+       local TOT_WAIT=0
+       local MAX_WAIT=$DURATION
+       local SHORT_WAIT=5
+
+       local rc
+       while [[ $TOT_WAIT -le $MAX_WAIT ]]; do
+               rc=0
+               echo sleeping $SHORT_WAIT sec ...
+               sleep $SHORT_WAIT
+               # this only checks whether processes exist
+               for P in $RACER_PROGS; do
+                       killall -0 $P.sh
+                       [[ $? -eq 0 ]] && (( rc+=1 ))
+               done
+               if [[ $rc -eq 0 ]]; then
+                       echo there should be NO racer processes:
+                       ps aux | grep -E "${RACER_PROGS// /|}"
+                       return 0
+               fi
+               echo -n "Waited $(( TOT_WAIT + SHORT_WAIT)), rc=$rc "
+               (( SHORT_WAIT+=SHORT_WAIT ))
+               (( TOT_WAIT+=SHORT_WAIT ))
+       done
+       ps aux | grep -E "${RACER_PROGS// /|}"
+       return 1
 }
 
+RC=0
+
 echo "Running $0 for $DURATION seconds. CTRL-C to exit"
 trap "
-    echo \"Cleaning up\" 
-    racer_cleanup
-    exit 0
-" 2 15
+       echo \"Cleaning up\" 
+       racer_cleanup
+       exit 0
+" INT TERM
 
 cd `dirname $0`
 for N in `seq 1 $NUM_THREADS`; do
-       ./file_create.sh $DIR $MAX_FILES &
-       ./dir_create.sh $DIR $MAX_FILES &
-       ./file_rename.sh $DIR $MAX_FILES &
-       ./file_link.sh $DIR $MAX_FILES &
-       ./file_symlink.sh $DIR $MAX_FILES &
-       ./file_concat.sh $DIR $MAX_FILES &
-       ./file_list.sh $DIR &
-       ./file_rm.sh $DIR $MAX_FILES &
+       for P in $RACER_PROGS; do
+               ./$P.sh $DIR $MAX_FILES &
+       done
 done
 
-sleep $DURATION;
-racer_cleanup
+sleep $DURATION
+racer_cleanup || RC=$?
+
 # Check our to see whether our test DIR is still available.
 df $DIR
-RC=$?
+(( RC+=$? ))
 if [ $RC -eq 0 ]; then
     echo "We survived $0 for $DURATION seconds."
 fi