X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Ftests%2Frun_tar.sh;h=0ea2ce9af47b81356bbd80336672b558209efb45;hb=25aa8527374f8120c113dc12adb1366a1ab98152;hp=823c7816660c367e3c9402e849f9cb86836a8b20;hpb=a6e6e1557180f89f0360e3cb9b9e32b465114b5f;p=fs%2Flustre-release.git diff --git a/lustre/tests/run_tar.sh b/lustre/tests/run_tar.sh index 823c781..0ea2ce9 100755 --- a/lustre/tests/run_tar.sh +++ b/lustre/tests/run_tar.sh @@ -17,7 +17,7 @@ set -x . $(dirname $0)/functions.sh -assert_env MOUNT END_RUN_FILE LOAD_PID_FILE LFS CLIENT_COUNT +assert_env MOUNT END_RUN_FILE LOAD_PID_FILE LFS CLIENT_COUNT LCTL trap signaled TERM @@ -35,8 +35,14 @@ CONTINUE=true while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do echoerr "$(date +'%F %H:%M:%S'): tar run starting" mkdir -p $TESTDIR + cd $TESTDIR + sync + USAGE=$(du -s /etc | awk '{print $1}') - FREE_SPACE=$($LFS df $TESTDIR | awk '/filesystem summary:/ {print $5}') + $LCTL set_param llite.*.lazystatfs=0 + df $TESTDIR || true + sleep 2 + FREE_SPACE=$(df $TESTDIR | awk '/:/ { print $4 }') AVAIL=$((FREE_SPACE * 9 / 10 / CLIENT_COUNT)) if [ $AVAIL -lt $USAGE ]; then echoerr "no enough free disk space: need $USAGE, avail $AVAIL" @@ -44,9 +50,7 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do break fi - cd $TESTDIR - do_tar & - wait $! + do_tar RC=$? PREV_ERRORS=$(grep "exit delayed from previous errors" $LOG) || true if [ $RC -ne 0 -a "$ERRORS_OK" -a "$PREV_ERRORS" ]; then