X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-vbr.sh;h=a6301a3216be72fc13865500d12c73a2252e54e1;hb=ad21703f66c0d013d3cbd2d7f307715ef77864ff;hp=14c9883a2ca325c6b6a26941c7888b33c135bb2a;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc;p=fs%2Flustre-release.git

diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh
index 14c9883..a6301a3 100644
--- a/lustre/tests/replay-vbr.sh
+++ b/lustre/tests/replay-vbr.sh
@@ -7,6 +7,12 @@ set -e
 # bug number:  16356
 ALWAYS_EXCEPT="12a   $REPLAY_VBR_EXCEPT"
 
+case "$(lsb_release -sr)" in	# only disable tests for el7
+7*)	# bug number:  LU-6455
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 4i 4j 4k 10b"
+	;;
+esac
+
 SAVE_PWD=$PWD
 LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 SETUP=${SETUP:-}
@@ -94,7 +100,7 @@ get_version() {
 
 #save COS setting
 cos_param_file=$TMP/rvbr-cos-params
-save_lustre_params $(comma_list $(mdts_nodes)) "mdt.*.commit_on_sharing" > $cos_param_file
+save_lustre_params $(get_facets MDS) "mdt.*.commit_on_sharing" > $cos_param_file
 
 test_0a() {
         get_version $CLIENT1 $DIR/$tdir/1a || true
@@ -211,7 +217,18 @@ test_2a() {  # extended former test_0d
     if (($pre != $post)); then
         error "version was changed: pre $pre, post $post"
     fi
-    do_node $CLIENT1 rm $DIR/$tfile-*
+	# remote directory
+	if [ $MDSCOUNT -ge 2 ]; then
+		#create remote dir
+		local MDT_IDX=1
+		pre=$(get_version $CLIENT1 $DIR)
+		do_node $CLIENT1 $LFS mkdir -i $MDT_IDX $DIR/$tfile-remote_dir
+		post=$(get_version $CLIENT1 $DIR)
+		if (($pre != $post)); then
+			error "version was changed: pre $pre, post $post"
+		fi
+	fi
+	do_node $CLIENT1 rm -rf $DIR/$tfile-*
 
 }
 run_test 2a "create operations doesn't change version of parent"
@@ -249,6 +266,18 @@ test_3a() { # former test_0f
     if (($pre != $post)); then
         error "version was changed: pre $pre, post $post"
     fi
+
+	if [ $MDSCOUNT -ge 2 ]; then
+		#create remote dir
+		local MDT_IDX=1
+		do_node $CLIENT1 $LFS mkdir -i $MDT_IDX $DIR/$tfile-remote_dir
+		pre=$(get_version $CLIENT1 $DIR)
+		do_node $CLIENT1 rmdir $DIR/$tfile-remote_dir
+		post=$(get_version $CLIENT1 $DIR)
+		if (($pre != $post)); then
+			error "version was changed: pre $pre, post $post"
+		fi
+	fi
 }
 run_test 3a "unlink doesn't change version of parent"
 
@@ -704,11 +733,11 @@ test_7_cycle() {
     # should fail as conflict expected
     client_evicted $CLIENT1 || rc=1
 
-    wait_recovery_complete $SINGLEMDS
-    wait_mds_ost_sync $SINGLEMDS
+	wait_recovery_complete $SINGLEMDS
+	wait_mds_ost_sync || error "wait_mds_ost_sync failed"
 
-    rm -rf $DIR/$tdir
-    return $rc
+	rm -rf $DIR/$tdir
+	return $rc
 }
 
 test_7a() {
@@ -864,7 +893,14 @@ test_7g() {
     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"
-    test_7_cycle "$first" "$lost" "$last" || error "Test 7g.3 failed"
+	if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.5.1) ]
+	then
+		test_7_cycle "$first" "$lost" "$last" ||
+			error "Test 7g.3 failed"
+	else #LU-4442 LU-3528
+		test_7_cycle "$first" "$lost" "$last" &&
+			error "Test 7g.3 failed"
+	fi
     return 0
 }
 run_test 7g "rename, {lost}, create"