X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=0bcbeba1c295eff7e46e729253755c97a8853f9e;hb=f03c8b1bb6ed317464257472e408b6fb6094fc61;hp=98474bc8d62829bf7c1d217433836d4701a4b443;hpb=6a81ffa1e9e44231d812e331c73cfa9df67746ed;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 98474bc..0bcbeba 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2426,10 +2426,10 @@ run_test 31p "remove of open striped directory"
 cleanup_test32_mount() {
 	local rc=0
 	trap 0
-	local loopdev=$(losetup -a | grep $EXT2_DEV | sed -ne 's/:.*$/p')
+	local loopdev=$(losetup -a | grep $EXT2_DEV | sed -ne 's/:.*$//p')
 	$UMOUNT $DIR/$tdir/ext2-mountpoint || rc=$?
 	losetup -d $loopdev || true
-	rm -rf $DIR/$tdir/ext2-mountpoint
+	rm -rf $DIR/$tdir
 	return $rc
 }
 
@@ -2613,59 +2613,49 @@ test_32o() {
 run_test 32o "stat d32o/symlink->tmp/symlink->lustre-root/$tfile"
 
 test_32p() {
-    log 32p_1
+	log 32p_1
 	rm -fr $DIR/d32p
-    log 32p_2
+	log 32p_2
 	rm -f $DIR/$tfile
-    log 32p_3
+	log 32p_3
 	touch $DIR/$tfile
-    log 32p_4
+	log 32p_4
 	test_mkdir -p $DIR/d32p/tmp
-    log 32p_5
+	log 32p_5
 	TMP_DIR=$DIR/d32p/tmp
-    log 32p_6
+	log 32p_6
 	ln -s $DIR/$tfile $TMP_DIR/symlink12
-    log 32p_7
+	log 32p_7
 	ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02
-    log 32p_8
+	log 32p_8
 	cat $DIR/d32p/tmp/symlink12 || error
-    log 32p_9
+	log 32p_9
 	cat $DIR/d32p/symlink02 || error
-    log 32p_10
+	log 32p_10
 }
 run_test 32p "open d32p/symlink->tmp/symlink->lustre-root/$tfile"
 
-cleanup_testdir_mount() {
-	local rc=0
-	trap 0
-	local loopdev=$(losetup -a | grep $EXT2_DEV | sed -ne 's/:.*$/p')
-	$UMOUNT $DIR/$tdir || rc=$?
-	losetup -d $loopdev || true
-	rm -rf $DIR/$tdir
-	return $rc
-}
-
 test_32q() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
-	trap cleanup_testdir_mount EXIT
-	test_mkdir -p $DIR/$tdir
-        touch $DIR/$tdir/under_the_mount
-	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
-	ls $DIR/$tdir | grep "\<under_the_mount\>" && error
-	cleanup_testdir_mount
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	touch $DIR/$tdir/ext2-mountpoint/under_the_mount
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint
+	ls $DIR/$tdir/ext2-mountpoint | grep "\<under_the_mount\>" && error
+	cleanup_test32_mount
 }
 run_test 32q "stat follows mountpoints in Lustre (should return error)"
 
 test_32r() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
-	trap cleanup_testdir_mount EXIT
-	test_mkdir -p $DIR/$tdir
-        touch $DIR/$tdir/under_the_mount
-	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
-	ls $DIR/$tdir | grep -q under_the_mount && error || true
-	cleanup_testdir_mount
+	trap cleanup_test32_mount EXIT
+	test_mkdir -p $DIR/$tdir/ext2-mountpoint
+	touch $DIR/$tdir/ext2-mountpoint/under_the_mount
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint
+	ls $DIR/$tdir/ext2-mountpoint | grep -q under_the_mount && error || true
+	cleanup_test32_mount
 }
 run_test 32r "opendir follows mountpoints in Lustre (should return error)"
 
@@ -15632,6 +15622,14 @@ test_401d() {
 run_test 401d "Verify 'lctl set_param' accepts values containing '='"
 
 test_402() {
+	local server_version=$(lustre_version_code $SINGLEMDS)
+	[[ $server_version -ge $(version_code 2.7.66) ]] ||
+	[[ $server_version -ge $(version_code 2.7.18.4) &&
+		$server_version -lt $(version_code 2.7.50) ]] ||
+	[[ $server_version -ge $(version_code 2.7.2) &&
+		$server_version -lt $(version_code 2.7.11) ]] ||
+		{ skip "Need MDS version 2.7.2+ or 2.7.18.4+ or 2.7.66+";
+			return; }
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	$LFS setdirstripe -i 0 $DIR/$tdir || error "setdirstripe -i 0 failed"
 #define OBD_FAIL_MDS_FLD_LOOKUP 0x15c