X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_tar.sh;h=823c7816660c367e3c9402e849f9cb86836a8b20;hb=25374e3b35f5776a9fd6e5b4cac273f7000511e9;hp=9005ac40ec51b07ae3b24326c1384ee530607e87;hpb=abf2237387d0d94ed623c64e1a44962242203aea;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_tar.sh b/lustre/tests/run_tar.sh
index 9005ac4..823c781 100755
--- a/lustre/tests/run_tar.sh
+++ b/lustre/tests/run_tar.sh
@@ -1,20 +1,23 @@
 #!/bin/bash
-set -x
 
 TMP=${TMP:-/tmp}
 
-TESTSUITELOG=${TESTSUITELOG:-$TMP/recovery-mds-scale}
-LOG=${TESTSUITELOG}_$(basename $0)-$(hostname)
-DEBUGLOG=${LOG}.debug
+TESTLOG_PREFIX=${TESTLOG_PREFIX:-$TMP/recovery-mds-scale}
+TESTNAME=${TESTNAME:-""}
+[ -n "$TESTNAME" ] && TESTLOG_PREFIX=$TESTLOG_PREFIX.$TESTNAME
+
+LOG=$TESTLOG_PREFIX.$(basename $0 .sh)_stdout.$(hostname -s).log
+DEBUGLOG=$(echo $LOG | sed 's/\(.*\)stdout/\1debug/')
 
 mkdir -p ${LOG%/*}
 
 rm -f $LOG $DEBUGLOG
 exec 2>$DEBUGLOG
+set -x
 
 . $(dirname $0)/functions.sh
 
-assert_env MOUNT END_RUN_FILE LOAD_PID_FILE
+assert_env MOUNT END_RUN_FILE LOAD_PID_FILE LFS CLIENT_COUNT
 
 trap signaled TERM
 
@@ -23,36 +26,48 @@ echo $$ >$LOAD_PID_FILE
 
 TESTDIR=$MOUNT/d0.tar-$(hostname)
 
+do_tar() {
+    tar cf - /etc | tar xf - >$LOG 2>&1
+    return ${PIPESTATUS[1]}
+}
+
 CONTINUE=true
 while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
-    echoerr "$(date +'%F %H:%M:%S'): tar run starting"
-    mkdir -p $TESTDIR
-    cd $TESTDIR
-    tar cf - /etc | tar xf - 2>&1 | tee $LOG &
-    load_pid=$!
-ps -e f -o "pid ppid pgrp comm" >$TMP/client-load.ps-list
-    wait $load_pid
-    RC=${PIPESTATUS[0]}
-    PREV_ERRORS=$(grep "exit delayed from previous errors" $LOG) || true
-    if [ $RC -ne 0 -a "$ERRORS_OK" -a "$PREV_ERRORS" ]; then
-        echoerr "$(date +'%F %H:%M:%S'): tar errors earlier, ignoring"
-        RC=0
-    fi
-    if [ $RC -eq 0 ]; then
-	echoerr "$(date +'%F %H:%M:%S'): tar succeeded"
-	cd $TMP
-	rm -rf $TESTDIR
-	echoerr "$(date +'%F %H:%M:%S'): tar run finished"
-    else
-	echoerr "$(date +'%F %H:%M:%S'): tar failed"
-	if [ -z "$ERRORS_OK" ]; then
-	    echo $(hostname) >> $END_RUN_FILE
+	echoerr "$(date +'%F %H:%M:%S'): tar run starting"
+	mkdir -p $TESTDIR
+	USAGE=$(du -s /etc | awk '{print $1}')
+	FREE_SPACE=$($LFS df $TESTDIR | awk '/filesystem summary:/ {print $5}')
+	AVAIL=$((FREE_SPACE * 9 / 10 / CLIENT_COUNT))
+	if [ $AVAIL -lt $USAGE ]; then
+		echoerr "no enough free disk space: need $USAGE, avail $AVAIL"
+		echo $(hostname) >> $END_RUN_FILE
+		break
+	fi
+
+	cd $TESTDIR
+	do_tar &
+	wait $!
+	RC=$?
+	PREV_ERRORS=$(grep "exit delayed from previous errors" $LOG) || true
+	if [ $RC -ne 0 -a "$ERRORS_OK" -a "$PREV_ERRORS" ]; then
+		echoerr "$(date +'%F %H:%M:%S'): tar errors earlier, ignoring"
+		RC=0
 	fi
-	if [ $BREAK_ON_ERROR ]; then
-	    # break
-            CONTINUE=false
+	if [ $RC -eq 0 ]; then
+		echoerr "$(date +'%F %H:%M:%S'): tar succeeded"
+		cd $TMP
+		rm -rf $TESTDIR
+		echoerr "$(date +'%F %H:%M:%S'): tar run finished"
+	else
+		echoerr "$(date +'%F %H:%M:%S'): tar failed"
+		if [ -z "$ERRORS_OK" ]; then
+			echo $(hostname) >> $END_RUN_FILE
+		fi
+		if [ $BREAK_ON_ERROR ]; then
+			# break
+			CONTINUE=false
+		fi
 	fi
-    fi
 done
 
 echoerr "$(date +'%F %H:%M:%S'): tar run exiting"