LU-1193 tests: test script fixes for incompatibility

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

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 8359981..1d3f1c3 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -5,9 +5,6 @@ set -e
 # bug number:  10124
 ALWAYS_EXCEPT="15c   $REPLAY_DUAL_EXCEPT"
 
-LFS=${LFS:-lfs}
-SETSTRIPE=${SETSTRIPE:-"$LFS setstripe"}
-GETSTRIPE=${GETSTRIPE:-"$LFS getstripe"}
 SAVE_PWD=$PWD
 PTLDEBUG=${PTLDEBUG:--1}
 LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
@@ -38,7 +35,11 @@ rm -rf $DIR/[df][0-9]*
 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 
-sleep 10 # Avert LVM and VM inability to flush caches in pre .33 kernels
+# 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
 
 test_0a() {
     touch $MOUNT2/$tfile-A # force sync FLD/SEQ update before barrier
@@ -289,11 +290,11 @@ test_14b() {
     wait_destroy_complete
     BEFOREUSED=`df -P $DIR | tail -1 | awk '{ print $3 }'`
     mkdir -p $MOUNT1/$tdir
-    $SETSTRIPE -o 0 $MOUNT1/$tdir
+    $SETSTRIPE -i 0 $MOUNT1/$tdir
     replay_barrier $SINGLEMDS
     createmany -o $MOUNT1/$tdir/$tfile- 5
 
-    $SETSTRIPE -o 0 $MOUNT2/f14b-3
+    $SETSTRIPE -i 0 $MOUNT2/f14b-3
     echo "data" > $MOUNT2/f14b-3
     createmany -o $MOUNT1/$tdir/$tfile-3- 5
     umount $MOUNT2