X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=3c453f1b6b52395e5792e25db65a3a9a3e60f40c;hb=0136a91b6d629556ef091f5ca210c13772207df9;hp=811d99ea3940b53612d78f4901a1e1fc0108652a;hpb=3c8a2d49ef4a17aad2973475178aea794b669f38;p=fs%2Flustre-release.git

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 811d99e..3c453f1 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1643,6 +1643,7 @@ t32_test() {
 
 	trap 'trap - RETURN; t32_test_cleanup' RETURN
 
+	load_modules
 	mkdir -p $tmp/mnt/lustre || error "mkdir $tmp/mnt/lustre failed"
 	$r mkdir -p $tmp/mnt/{mdt,ost}
 	$r tar xjvf $tarball -S -C $tmp || {
@@ -1893,11 +1894,13 @@ t32_test() {
 		}
 
 		if [ "$dne_upgrade" != "no" ]; then
-			$LFS mkdir -i 1 $tmp/mnt/lustre/remote_dir || {
+			$LFS mkdir -i 1 -c2 $tmp/mnt/lustre/remote_dir || {
 				error_noexit "set remote dir failed"
 				return 1
 			}
 
+			$LFS setdirstripe -D -c2 $tmp/mnt/lustre/remote_dir
+
 			pushd $tmp/mnt/lustre
 			tar -cf - . --exclude=./remote_dir |
 				tar -xvf - -C remote_dir 1>/dev/null || {
@@ -2090,6 +2093,9 @@ test_32c() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	t32_check
 	for tarball in $tarballs; do
+		# Do not support 1_8 and 2_1 direct upgrade to DNE2 anymore */
+		echo $tarball | grep "1_8" && continue
+		echo $tarball | grep "2_1" && continue
 		dne_upgrade=yes t32_test $tarball writeconf || rc=$?
 	done
 	return $rc