X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fracer%2Fracer.sh;h=1da6465b1e0ce05faa48064f378a5fe425bbd950;hp=5fad750522f4094710263facd511aba803a76903;hb=6acd28ed6ce281843b2bf2892ffa0e8725d08f3a;hpb=3a84f1d934e471f2ca6fb4c68a0e674651adf73e diff --git a/lustre/tests/racer/racer.sh b/lustre/tests/racer/racer.sh index 5fad750..1da6465 100755 --- a/lustre/tests/racer/racer.sh +++ b/lustre/tests/racer/racer.sh @@ -16,14 +16,14 @@ RACER_PROGS="file_create dir_create file_rm file_rename file_link file_symlink \ file_list file_concat file_exec" if [ $MDSCOUNT -gt 1 ]; then - RACER_PROGS="${RACER_PROGS} dir_remote" + RACER_PROGS="${RACER_PROGS} dir_remote dir_migrate" fi racer_cleanup() { echo "racer cleanup" for P in $RACER_PROGS; do - killall $P.sh + killall -q $P.sh done trap 0 @@ -43,14 +43,14 @@ racer_cleanup() done if [[ $rc -eq 0 ]]; then echo there should be NO racer processes: - ps aux | grep -E "${RACER_PROGS// /|}" + ps uww -C "${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// /|}" + ps uww -C "${RACER_PROGS// /,}" return 1 } @@ -76,7 +76,5 @@ racer_cleanup || RC=$? # Check our to see whether our test DIR is still available. df $DIR (( RC+=$? )) -if [ $RC -eq 0 ]; then - echo "We survived $0 for $DURATION seconds." -fi +[ $RC -eq 0 ] && echo "We survived $0 for $DURATION seconds." exit $RC