X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-single-lmv.sh;h=9c8d9bc1215aa5ba8d0ba8fe825418c13e569907;hb=0ecb2a167c56ffff8e4fcb5cf576fb8c5d9e64fe;hp=c053978acf3e8c280bbc19f4d5e2bd9a8017c4f1;hpb=0fe560ea5dd4e582f2393f54de106e34a8b2c6ae;p=fs%2Flustre-release.git

diff --git a/lustre/tests/replay-single-lmv.sh b/lustre/tests/replay-single-lmv.sh
index c053978..9c8d9bc 100755
--- a/lustre/tests/replay-single-lmv.sh
+++ b/lustre/tests/replay-single-lmv.sh
@@ -1,34 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
-#set -v
 
-#
-# This test needs to be run on the client
-#
-
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/lmv.sh}
-
+init_test_env "$@"
 
-# Skip these tests
-ALWAYS_EXCEPT=""
+# bug number for skipped test:
+ALWAYS_EXCEPT="REPLAY_SINGLE_LMV_EXCEPT "
 build_test_filter
 
 SETUP=${SETUP:-"setup"}
 CLEANUP=${CLEANUP:-"stopall"}
 
 if [ "$ONLY" == "cleanup" ]; then
-    lctl set_param debug=0 || true
-    $CLEANUP
-    exit 0
+	lctl set_param debug=0 || true
+	$CLEANUP
+	exit 0
 fi
 
 setup() {
-    formatall
-    setupall
+	formatall
+	setupall
 }
 
 $SETUP
@@ -39,6 +32,13 @@ fi
 
 mkdir -p $DIR
 
+# LU-482 Avert LVM and VM inability to flush caches in pre .33 kernels
+if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then
+    sync
+    do_facet $SINGLEMDS sync
+fi
+
+force_new_seq mds1
 
 test_0() {
     replay_barrier mds1
@@ -108,6 +108,6 @@ test_3b() {
 }
 run_test 3b "mkdir cross-node dir (fail mds with inode)"
 
-equals_msg test complete, cleaning up
+complete $SECONDS
 $CLEANUP