Branch HEAD

[fs/lustre-release.git] / lustre / tests / replay-ost-single.sh

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index fe232a4..8dd9d9d 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -3,7 +3,8 @@
 set -e
 
 PTLDEBUG=${PTLDEBUG:--1}
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+SETUP=${SETUP:-""}
 CLEANUP=${CLEANUP:-""}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
@@ -20,54 +21,25 @@ CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
 # BUG NUMBER: 
 ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT"
 
+#                                      
+[ "$SLOW" = "no" ] && EXCEPT_SLOW=""
+
 # It is replay-ost-single, after all
 OSTCOUNT=1
 
-gen_config() {
-    formatall
-}
-
-cleanup() {
-    cleanupall
-}
-
-if [ "$ONLY" == "cleanup" ]; then
-    cleanup
-    exit
-fi
-
 build_test_filter
 
-SETUP=${SETUP:-"setup"}
+REFORMAT=--reformat cleanup_and_setup_lustre
+rm -rf $DIR/[df][0-9]*
 
 test_0a() {
+    zconf_umount `hostname` $MOUNT -f
     # needs to run during initial client->OST connection
     #define OBD_FAIL_OST_ALL_REPLY_NET       0x211
-    do_facet ost "sysctl -w lustre.fail_loc=0x80000211"
+    do_facet ost "lctl set_param fail_loc=0x80000211"
     zconf_mount `hostname` $MOUNT && df $MOUNT || error "0a mount fail"
 }
-
-setup() {
-    gen_config
-    start mds1 `mdsdevname 1` $MDS_MOUNT_OPTS
-    start ost1 `ostdevname 1` $OST_MOUNT_OPTS
-    [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
-
-    # this might not mount if we aren't running test 0a
-    [ -z "`grep " $MOUNT " /proc/mounts`" ] && \
-       run_test 0a "target handle mismatch (bug 5317) `date +%H:%M:%S`" 
-
-    if [ -z "`grep " $MOUNT " /proc/mounts`" ]; then
-       zconf_mount `hostname` $MOUNT || error "mount fail"
-    fi
-    sleep 5
-
-    do_facet ost1 "sysctl -w lustre.fail_loc=0"
-}
-
-mkdir -p $DIR
-
-$SETUP
+run_test 0a "target handle mismatch (bug 5317) `date +%H:%M:%S`"
 
 test_0b() {
     fail ost1
@@ -125,10 +97,11 @@ run_test 4 "Fail OST during read, with verification"
 
 test_5() {
     [ -z "`which iozone 2> /dev/null`" ] && log "iozone missing" && return
-    FREE=`df -P -h $DIR | tail -n 1 | awk '{ print $3 }'`
-    case $FREE in
-    *T|*G) FREE=1G;;
-    esac
+    FREE=`df -P $DIR | tail -n 1 | awk '{ print $4/2 }'`
+    GB=1048576  # 1048576KB == 1GB
+    if (( FREE > GB )); then
+        FREE=$GB
+    fi
     IOZONE_OPTS="-i 0 -i 1 -i 2 -+d -r 4 -s $FREE"
     iozone $IOZONE_OPTS -f $DIR/$tfile &
     PID=$!
@@ -144,7 +117,7 @@ test_5() {
 run_test 5 "Fail OST during iozone"
 
 kbytesfree() {
-   awk '{total+=$1} END {print total}' /proc/fs/lustre/osc/*-osc-*/kbytesfree
+   lctl get_param -n osc.*-osc-*.kbytesfree | awk '{total+=$1} END {print total}'
 }
 
 test_6() {
@@ -158,7 +131,7 @@ test_6() {
     sleep 2                                    # ensure we have a fresh statfs
     sync
 #define OBD_FAIL_MDS_REINT_NET_REP       0x119
-    do_facet mds "sysctl -w lustre.fail_loc=0x80000119"
+    do_facet mds "lctl set_param fail_loc=0x80000119"
     after_dd=`kbytesfree`
     log "before: $before after_dd: $after_dd"
     (( $before > $after_dd )) || return 1