X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-benchmark.sh;h=370afae292ac35344421ad145512d2c324e516a6;hp=0cbbf02b028715dc469b0c97f8be72ff7458b738;hb=fe2300b2fb91cc321412a6e53335848741ea30cd;hpb=e4cf956f93a4384d19ea73e601a6651710703492

diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh
index 0cbbf02..370afae 100644
--- a/lustre/tests/sanity-benchmark.sh
+++ b/lustre/tests/sanity-benchmark.sh
@@ -14,6 +14,9 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+# bug number:
+ALWAYS_EXCEPT="$SANITY_BENCHMARK_EXCEPT"
+
 MAX_THREADS=${MAX_THREADS:-20}
 RAMKB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
 if [ -z "$THREADS" ]; then
@@ -26,16 +29,7 @@ RSIZE=${RSIZE:-512}
 DEBUG_LVL=${DEBUG_LVL:-0}
 DEBUG_OFF=${DEBUG_OFF:-"eval lctl set_param debug=\"$DEBUG_LVL\""}
 DEBUG_ON=${DEBUG_ON:-"eval lctl set_param debug=0x33f0484"}
-
-PIOSBIN=${PIOSBIN:-$(which pios 2> /dev/null || true)}
-
-pios_THREADCOUNT=${pios_THREADCOUNT:-"1,8,40"}
-[ "$SLOW" = "no" ] && pios_THREADCOUNT=8
-
-pios_REGIONCOUNT=${pios_REGIONCOUNT:-1024}
-pios_CHUNKSIZE=${pios_CHUNKSIZE:-1M}
-pios_REGIONSIZE=${pios_REGIONSIZE:-8M}
-pios_OFFSET=${pios_OFFSET:-16M}
+DIRECTIO=${DIRECTIO:-directio}
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="iozone"
 
@@ -51,7 +45,7 @@ test_dbench() {
 	return
     fi
 
-    DBENCHDIR=$MOUNT/d0.$HOSTNAME
+    local DBENCHDIR=$DIR/d0.$HOSTNAME
     mkdir -p $DBENCHDIR
     local SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
     DB_THREADS=$((SPACE / 50000))
@@ -59,9 +53,11 @@ test_dbench() {
     
     $DEBUG_OFF
     myUID=$RUNAS_ID
+    myGID=$RUNAS_GID
     myRUNAS=$RUNAS
-    FAIL_ON_ERROR=false check_runas_id_ret $myUID $myUID $myRUNAS || { myRUNAS="" && myUID=$UID; }
-    chown $myUID:$myUID $DBENCHDIR
+    FAIL_ON_ERROR=false check_runas_id_ret $myUID $myGID $myRUNAS || \
+      { myRUNAS="" && myUID=$UID && myGID=`id -g $USER`; }
+    chown $myUID:$myGID $DBENCHDIR
     local duration=""
     [ "$SLOW" = "no" ] && duration=" -t 120"
     if [ "$SLOW" != "no" -o $DB_THREADS -eq 1 ]; then
@@ -82,7 +78,7 @@ test_bonnie() {
 	skip_env "No bonnie++ installed"
 	return 0
     fi
-    BONDIR=$MOUNT/d0.bonnie
+    local BONDIR=$DIR/d0.bonnie
     mkdir -p $BONDIR
     $LFS setstripe -c -1 $BONDIR
     sync
@@ -92,10 +88,12 @@ test_bonnie() {
     log "min OST has ${MIN}kB available, using ${SIZE}kB file size"
     $DEBUG_OFF
     myUID=$RUNAS_ID
+    myGID=$RUNAS_GID
     myRUNAS=$RUNAS
-    FAIL_ON_ERROR=false check_runas_id_ret $myUID $myUID $myRUNAS || { myRUNAS="" && myUID=$UID; }
-    chown $myUID:$myUID $BONDIR		
-    $myRUNAS bonnie++ -f -r 0 -s$((SIZE / 1024)) -n 10 -u$myUID:$myUID -d$BONDIR
+    FAIL_ON_ERROR=false check_runas_id_ret $myUID $myGID $myRUNAS || \
+      { myRUNAS="" && myUID=$UID && myGID=`id -$USER`; }
+    chown $myUID:$myGID $BONDIR		
+    $myRUNAS bonnie++ -f -r 0 -s$((SIZE / 1024)) -n 10 -u$myUID:$myGID -d$BONDIR
     $DEBUG_ON
 }
 run_test bonnie "bonnie++"
@@ -108,7 +106,8 @@ test_iozone() {
 
     export O_DIRECT
     
-    IOZDIR=$MOUNT/d0.iozone
+    local IOZDIR=$DIR/d0.iozone
+    wait_delete_completed || true
     mkdir -p $IOZDIR
     $LFS setstripe -c -1 $IOZDIR
     sync
@@ -122,23 +121,27 @@ test_iozone() {
 		# $SPACE was calculated with all OSTs
     $DEBUG_OFF
     myUID=$RUNAS_ID
+    myGID=$RUNAS_GID
     myRUNAS=$RUNAS
-    FAIL_ON_ERROR=false check_runas_id_ret $myUID $myUID $myRUNAS || { myRUNAS="" && myUID=$UID; }
-    chown $myUID:$myUID $IOZDIR
+    FAIL_ON_ERROR=false check_runas_id_ret $myUID $myGID $myRUNAS || \
+        { myRUNAS="" && myUID=$UID && myGID=`id -g $USER`; }
+    chown $myUID:$myGID $IOZDIR
     $myRUNAS iozone $IOZONE_OPTS -s $SIZE -f $IOZFILE 2>&1 | tee $IOZLOG
     tail -1 $IOZLOG | grep -q complete || \
 	{ error "iozone (1) failed" && return 1; }
     rm -f $IOZLOG
+    wait_delete_completed || true
     $DEBUG_ON
     
     # check if O_DIRECT support is implemented in kernel
     if [ -z "$O_DIRECT" ]; then
-	touch $MOUNT/f.iozone
-	if ! ./directio write $MOUNT/f.iozone 0 1; then
+	touch $DIR/f.iozone
+	if ! $DIRECTIO write $DIR/f.iozone 0 1; then
 	    log "SKIP iozone DIRECT IO test"
 	    O_DIRECT=no
 	fi
-	rm -f $MOUNT/f.iozone
+	rm -f $DIR/f.iozone
+	wait_delete_completed || true
     fi
     if [ "$O_DIRECT" != "no" -a "$IOZONE_DIR" != "no" ]; then
 	$DEBUG_OFF
@@ -146,6 +149,7 @@ test_iozone() {
 	tail -1 $IOZLOG | grep -q complete || \
 	    { error "iozone (2) failed" && return 1; }
 	rm -f $IOZLOG
+	wait_delete_completed || true
 	$DEBUG_ON
     fi
 
@@ -166,6 +170,7 @@ test_iozone() {
 	tail -1 $IOZLOG | grep -q complete || \
 	    { error "iozone (3) failed" && return 1; }
 	rm -f $IOZLOG
+	wait_delete_completed || true
 	$DEBUG_ON
     elif [ $IOZVER -lt 3145 ]; then
 	VER=`iozone -v | awk '/Revision:/ { print $3 }'`
@@ -175,126 +180,24 @@ test_iozone() {
 run_test iozone "iozone"
 
 test_fsx() {
+    local testfile=$DIR/f0.fsxfile
     FSX_SIZE=$SIZE
     FSX_COUNT=1000
     local SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
     [ $SPACE -lt $FSX_SIZE ] && FSX_SIZE=$((SPACE * 3 / 4))
     $DEBUG_OFF
     FSX_SEED=${FSX_SEED:-$RANDOM}
-    rm -f $MOUNT/fsxfile
-    $LFS setstripe -c -1 $MOUNT/fsxfile
-    echo Using FSX_SEED=$FSX_SEED FSX_SIZE=$FSX_SIZE FSX_COUNT=$FSX_COUNT
-    fsx -c 50 -p 1000 -S $FSX_SEED -P $TMP -l $FSX_SIZE \
-	-N $(($FSX_COUNT * 100)) $MOUNT/fsxfile
+    rm -f $testfile
+    $LFS setstripe -c -1 $testfile
+    CMD="fsx -c 50 -p 1000 -S $FSX_SEED -P $TMP -l $FSX_SIZE \
+        -N $((FSX_COUNT * 100)) $FSXOPT $testfile"
+    echo "Using: $CMD"
+    $CMD || error "fsx failed"
+    rm -f $testfile
     $DEBUG_ON
 }
 run_test fsx "fsx"
 
-
-############################################################
-# PIOS
-#
-
-iterpr_KMGT () {
-    local str=$1
-    local num=${str:0:${#str}-1}
-    case ${str:${#str}-1} in
-        k|K ) num=$((num << 10));; #
-        m|M ) num=$((num << 20));; # emacs is confsued by the <<  and
-        g|G ) num=$((num << 30));; # these comments help it out.
-        t|T ) num=$((num << 40));; #
-          * ) num=$str;;
-    esac
-    echo $num
-}
-
-space_check () {
-    # space estimation
-    # /* Adding 10% to total test size for filesystem overhead */
-    #  size = size + (double)(size) * (double) (0.1);
-    # 
-    #  total_test_size = runarg->stream[n - 1].max_offset +
-    #                            runarg->regionsize;
-
-    local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }')
-    local size=$(($(iterpr_KMGT $pios_REGIONCOUNT) * \
-                  $(iterpr_KMGT $pios_OFFSET) + \
-                  $(iterpr_KMGT $pios_REGIONSIZE) ))
-    size=$(( size + size / 10 ))
-    if [ $((space * 1024)) -le $size ]; then 
-        echo "Need free space atleast $size, have $((space * 1024))"
-        return 10
-    fi
-}
-
-pios_setup() { 
-    local testdir=$DIR/$tdir
-    mkdir -p $testdir
-
-    stripes=1
-    [ "$1" == "--stripe" ] && stripes=-1
-    $LFS setstripe $testdir -c $stripes
-    echo "Test directory stripe count: $stripes"
-}
-
-pios_cleanup() {
-    local rc=$1
-    local testdir=$DIR/$tdir
-    [ $rc = 0 ] && rm -rf $testdir
-}
-
-run_pios () {
-    local testdir=$DIR/$tdir
-    local cmd="$PIOSBIN  -t $pios_THREADCOUNT -n $pios_REGIONCOUNT \
-                         -c $pios_CHUNKSIZE -s $pios_REGIONSIZE    \
-                         -o $pios_OFFSET  $@ -p $testdir"
-    
-    if [ ! -d $testdir ]; then  
-        error "No test directory created, setup_pios must have failed"
-        return 20
-    fi
-
-    log "$cmd"
-
-    local rc=0
-    eval $cmd
-    rc=$?
-
-    return $rc
-}
-
-test_pios_ssf() {
-    if  [ -z "$PIOSBIN" ]; then
-        skip_env "$0 : pios not found PIOSBIN=$PIOSBIN"
-	return
-    fi
-
-    local rc=0
-    space_check || { skip_env "not enough space" && return 0; }
-    pios_setup --stripe || return
-    run_pios || return
-    run_pios  --verify || rc=$? 
-    pios_cleanup $rc
-    return $rc
-}
-run_test pios_ssf "pios shared single file"
-
-test_pios_fpp() {
-    if  [ -z "$PIOSBIN" ]; then
-        skip_env "pios not found PIOSBIN=$PIOSBIN"
-        return
-    fi
-
-    local rc=0
-    space_check || { skip_env "not enough space" && return 0; }
-    pios_setup || return
-    run_pios -L fpp || return
-    run_pios -L fpp --verify || rc=$?
-    pios_cleanup $rc
-    return $rc
-}
-run_test pios_fpp "pios file per process"
-
-equals_msg `basename $0`: test complete, cleaning up
+complete $SECONDS
 check_and_cleanup_lustre
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
+exit_status