X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-vbr.sh;h=1994aaa768fc52c75459acd1542a73cd4ffb1835;hb=d48a0ebb5a8d5d49684325434b503e8aab085397;hp=46a96d6b55b7db23eda16f9d21d132e1634a10f8;hpb=5084c376cb20554e1e89351042361dce4133f8fa;p=fs%2Flustre-release.git

diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh
index 46a96d6..1994aaa 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_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
 
@@ -42,60 +35,6 @@ CLIENT2=${CLIENT2:-$CLIENT1}
 
 is_mounted $MOUNT2 || error "MOUNT2 is not mounted"
 
-rmultiop_start() {
-	local client=$1
-	local file=$2
-	local cmds=$3
-	local WAIT_MAX=${4:-60}
-	local wait_time=0
-
-	# We need to run do_node in bg, because pdsh does not exit
-	# if child process of run script exists.
-	# I.e. pdsh does not exit when runmultiop_bg_pause exited,
-	# because of multiop_bg_pause -> $MULTIOP_PROG &
-	# By the same reason we need sleep a bit after do_nodes starts
-	# to let runmultiop_bg_pause start muliop and
-	# update /tmp/multiop_bg.pid ;
-	# The rm /tmp/multiop_bg.pid guarantees here that
-	# we have the updated by runmultiop_bg_pause
-	# /tmp/multiop_bg.pid file
-
-	local pid_file=$TMP/multiop_bg.pid.$$
-	do_node $client "MULTIOP_PID_FILE=$pid_file LUSTRE= \
-			runmultiop_bg_pause $file $cmds" &
-	local pid=$!
-	local multiop_pid
-
-	while [[ $wait_time -lt $WAIT_MAX ]]; do
-		sleep 3
-		wait_time=$((wait_time + 3))
-		multiop_pid=$(do_node $client cat $pid_file)
-		if [ -n "$multiop_pid" ]; then
-			break
-		fi
-	done
-
-	[ -n "$multiop_pid" ] ||
-		error "$client : Can not get multiop_pid from $pid_file "
-
-	eval export $(node_var_name $client)_multiop_pid=$multiop_pid
-	eval export $(node_var_name $client)_do_node_pid=$pid
-	local var=$(node_var_name $client)_multiop_pid
-	echo client $client multiop_bg started multiop_pid=${!var}
-	return $?
-}
-
-rmultiop_stop() {
-    local client=$1
-    local multiop_pid=$(node_var_name $client)_multiop_pid
-    local do_node_pid=$(node_var_name $client)_do_node_pid
-
-    echo "Stopping multiop_pid=${!multiop_pid} (kill ${!multiop_pid} on $client)"
-    do_node $client kill -USR1 ${!multiop_pid}
-
-    wait ${!do_node_pid}
-}
-
 #
 # get_version(): Gets the version of an object on servers
 # Parameter1: Client/Machine Name
@@ -916,21 +855,20 @@ test_7f() {
 run_test 7f "unlink, {lost}, rename"
 
 test_7g() {
-    first="createmany -o $DIR/$tdir/$tfile- 1; mv $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile-1"
-    lost="mkdir $MOUNT2/$tdir/$tfile-0;rmdir $MOUNT2/$tdir/$tfile-0"
-    last="createmany -o $DIR/$tdir/$tfile- 1"
-    test_7_cycle "$first" "$lost" "$last" && error "Test 7g.1 failed"
-
-    first="createmany -o $DIR/$tdir/$tfile- 2; mv $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile-1"
-    lost="createmany -o $MOUNT2/$tdir/$tfile- 1; rm $MOUNT2/$tdir/$tfile-0"
-    last="mkdir $DIR/$tdir/$tfile-0"
-    test_7_cycle "$first" "$lost" "$last" && error "Test 7g.2 failed"
-
-    first="createmany -o $DIR/$tdir/$tfile- 1; mv $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile"
-    lost="createmany -o $MOUNT2/$tdir/$tfile- 1"
-    last="link $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile-1"
-	if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.5.1) ]
-	then
+	first="createmany -o $DIR/$tdir/$tfile- 1; mv $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile-1"
+	lost="mkdir $MOUNT2/$tdir/$tfile-0;rmdir $MOUNT2/$tdir/$tfile-0"
+	last="createmany -o $DIR/$tdir/$tfile- 1"
+	test_7_cycle "$first" "$lost" "$last" && error "Test 7g.1 failed"
+
+	first="createmany -o $DIR/$tdir/$tfile- 2; mv $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile-1"
+	lost="createmany -o $MOUNT2/$tdir/$tfile- 1; rm $MOUNT2/$tdir/$tfile-0"
+	last="mkdir $DIR/$tdir/$tfile-0"
+	test_7_cycle "$first" "$lost" "$last" && error "Test 7g.2 failed"
+
+	first="createmany -o $DIR/$tdir/$tfile- 1; mv $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile"
+	lost="createmany -o $MOUNT2/$tdir/$tfile- 1"
+	last="link $DIR/$tdir/$tfile-0 $DIR/$tdir/$tfile-1"
+	if [ "$MDS1_VERSION" -lt $(version_code 2.5.1) ]; then
 		test_7_cycle "$first" "$lost" "$last" ||
 			error "Test 7g.3 failed"
 	else #LU-4442 LU-3528