X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-vbr.sh;h=f85f96acba35b733cf52a0f5dd2b99522b8978da;hb=8e563553c0a26f0d8e8caf2a44b44a7f552531e9;hp=f6414989a7caec1e6ae9981a2ad0512ed28b8d2e;hpb=782b3533edb419374b7357b67ba4f9960d7e96cf;p=fs%2Flustre-release.git

diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh
index f641498..f85f96a 100755
--- a/lustre/tests/replay-vbr.sh
+++ b/lustre/tests/replay-vbr.sh
@@ -1,27 +1,20 @@
 #!/bin/bash
-# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
-# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 
 set -e
 
-# bug number:
-ALWAYS_EXCEPT=" $REPLAY_VBR_EXCEPT"
-
-SAVE_PWD=$PWD
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
-SETUP=${SETUP:-}
-CLEANUP=${CLEANUP:-}
 MOUNT_2=${MOUNT_2:-"yes"}
-export MULTIOP=${MULTIOP:-multiop}
+
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_test_env "$@"
 init_logging
 
 remote_mds_nodsh && log "SKIP: remote MDS with nodsh" && exit 0
 
+ALWAYS_EXCEPT=" $REPLAY_VBR_EXCEPT"
+
 #                                  ~6  (min)"
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="7"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="7 "
 
 build_test_filter
 
@@ -121,7 +114,7 @@ test_1b() { # former test_0b
 
     do_facet $SINGLEMDS "$LCTL set_param mdd.${!var}.sync_permission=0"
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
-    do_node $CLIENT1 mkdir -p -m 755 $MOUNT/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
 
     replay_barrier $SINGLEMDS
     do_node $CLIENT2 chmod 777 $MOUNT2/$tdir
@@ -219,7 +212,7 @@ test_2b() { # former test_0e
     do_facet $SINGLEMDS "$LCTL set_param mdd.${!var}.sync_permission=0"
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
-    do_node $CLIENT1 mkdir -p -m 755 $DIR/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
 
     replay_barrier $SINGLEMDS
     do_node $CLIENT2 chmod 777 $MOUNT2/$tdir
@@ -267,7 +260,7 @@ test_3b() { # former test_0g
     do_facet $SINGLEMDS "$LCTL set_param mdd.${!var}.sync_permission=0"
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
-    do_node $CLIENT1 mkdir -p -m 755 $DIR/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
     do_node $CLIENT1 mcreate $DIR/$tdir/$tfile
 
     replay_barrier $SINGLEMDS
@@ -537,7 +530,7 @@ test_5a() { # former test_0s
 	local tp_post
 
 	do_node $CLIENT1 mcreate $DIR/$tfile
-	do_node $CLIENT1 mkdir -p $DIR/$tdir
+	do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $DIR/$tdir
 	pre=$(chk_get_version $CLIENT1 $DIR/$tfile)
 	tp_pre=$(chk_get_version $CLIENT1 $DIR/$tdir)
 	do_node $CLIENT1 link $DIR/$tfile $DIR/$tdir/$tfile
@@ -561,7 +554,7 @@ test_5b() { # former test_0t
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
     do_node $CLIENT1 mcreate $DIR/$tfile
-    do_node $CLIENT1 mkdir -p -m 755 $DIR/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
 
     replay_barrier $SINGLEMDS
     do_node $CLIENT2 chmod 777 $MOUNT2/$tdir
@@ -584,7 +577,7 @@ test_5c() { # former test_0u
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
     do_node $CLIENT1 openfile -f O_RDWR:O_CREAT -m 0644 $DIR/$tfile
-    do_node $CLIENT1 mkdir -p $DIR/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
 
     replay_barrier $SINGLEMDS
     do_node $CLIENT2 chmod 666 $MOUNT2/$tfile
@@ -606,7 +599,7 @@ test_6a() { # former test_0v
 	local tp_post
 
 	do_node $CLIENT1 mcreate $DIR/$tfile
-	do_node $CLIENT1 mkdir -p $DIR/$tdir
+	do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
 	sp_pre=$(chk_get_version $CLIENT1 $DIR)
 	tp_pre=$(chk_get_version $CLIENT1 $DIR/$tdir)
 	do_node $CLIENT1 mv $DIR/$tfile $DIR/$tdir/$tfile
@@ -645,7 +638,7 @@ test_6c() { # former test_0x
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
     do_node $CLIENT1 mcreate $DIR/$tfile
-    do_node $CLIENT1 mkdir -p -m 755 $DIR/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
 
     replay_barrier $SINGLEMDS
     do_node $CLIENT2 chmod 777 $MOUNT2
@@ -668,7 +661,7 @@ test_6d() { # former test_0y
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
     do_node $CLIENT1 mcreate $DIR/$tfile
-    do_node $CLIENT1 mkdir -p -m 755 $DIR/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
 
     replay_barrier $SINGLEMDS
     do_node $CLIENT2 chmod 777 $MOUNT2/$tdir
@@ -699,7 +692,7 @@ test_7_cycle() {
     do_facet $SINGLEMDS "$LCTL set_param mdd.${!var}.sync_permission=0"
     do_facet $SINGLEMDS "$LCTL set_param mdt.${!var}.commit_on_sharing=0"
 
-    do_node $CLIENT1 mkdir -p $DIR/$tdir
+    do_node $CLIENT1 $LFS mkdir -i 0 -c 1 $MOUNT/$tdir
     replay_barrier $SINGLEMDS
     # first operation
     echo "$cname first: $first"
@@ -723,21 +716,21 @@ test_7_cycle() {
 }
 
 test_7a() {
-    first="createmany -o $DIR/$tdir/$tfile- 1"
-    lost="rm $MOUNT2/$tdir/$tfile-0"
-    last="createmany -o $DIR/$tdir/$tfile- 1"
-    test_7_cycle "$first" "$lost" "$last" || error "Test 7a.1 failed"
+	first="createmany -o $DIR/$tdir/$tfile- 1"
+	lost="rm $MOUNT2/$tdir/$tfile-0"
+	last="createmany -o $DIR/$tdir/$tfile- 1"
+	test_7_cycle "$first" "$lost" "$last" || error "Test 7a.1 failed"
 
-    first="createmany -o $DIR/$tdir/$tfile- 1"
-    lost="rm $MOUNT2/$tdir/$tfile-0"
-    last="mkdir $DIR/$tdir/$tfile-0"
-    test_7_cycle "$first" "$lost" "$last" || error "Test 7a.2 failed"
+	first="createmany -o $DIR/$tdir/$tfile- 1"
+	lost="rm $MOUNT2/$tdir/$tfile-0"
+	last="$LFS mkdir -i 0 -c 1 $DIR/$tdir/$tfile-0"
+	test_7_cycle "$first" "$lost" "$last" || error "Test 7a.2 failed"
 
-    first="mkdir $DIR/$tdir/$tfile-0"
-    lost="mv $MOUNT2/$tdir/$tfile-0 $MOUNT2/$tdir/$tfile-1"
-    last="createmany -o $DIR/$tdir/$tfile- 1"
-    test_7_cycle "$first" "$lost" "$last" || error "Test 7a.3 failed"
-    return 0
+	first="mkdir $DIR/$tdir/$tfile-0"
+	lost="mv $MOUNT2/$tdir/$tfile-0 $MOUNT2/$tdir/$tfile-1"
+	last="createmany -o $DIR/$tdir/$tfile- 1"
+	test_7_cycle "$first" "$lost" "$last" || error "Test 7a.3 failed"
+	return 0
 }
 run_test 7a "create, {lost}, create"
 
@@ -1016,7 +1009,6 @@ test_10b() { # former test_2b
 	local post
 	local var=${SINGLEMDS}_svc
 
-	[ -n "$CLIENTS" ] || { skip "Need two or more clients" && exit 0; }
 	[ $CLIENTCOUNT -ge 2 ] || \
 		{ skip "Need two or more clients, have $CLIENTCOUNT" && \
 			exit 0; }