X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-vbr.sh;h=ca00df5a4704417f744d6e0dda1752730ed8776b;hb=4f53536d002c13886210b672b657795baa067144;hp=af1a196e12f800f57b8263045dfbf645e1fe2a0f;hpb=96a0f6eef77190d166de0ecc7a66ae2ac2b6ae53;p=fs%2Flustre-release.git

diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh
index af1a196..ca00df5 100644
--- a/lustre/tests/replay-vbr.sh
+++ b/lustre/tests/replay-vbr.sh
@@ -94,7 +94,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
@@ -727,11 +727,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() {
@@ -887,7 +887,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"