X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=0ca6ce9fda097176ec2701b8726a095c1ced22bb;hb=f3e101a36310c0c2b9d516c09ec0166eb24524d2;hp=c9355e6affea1745ce63179eb92e7c0941289d61;hpb=e16e3d46ee8c44e691c5cd3d25161f2f297fa0fd;p=fs%2Flustre-release.git

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c9355e6..0ca6ce9 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -15,7 +15,7 @@ init_logging
 ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 32newtarball"
 
 # bug number for skipped test: LU-11915
-ALWAYS_EXCEPT="$ALWAYS_EXCEPT  110"
+ALWAYS_EXCEPT="$ALWAYS_EXCEPT  110 115"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 if $SHARED_KEY; then
@@ -2137,9 +2137,9 @@ t32_test() {
 			$LFS setdirstripe -D -c2 $tmp/mnt/lustre/striped_dir
 
 			pushd $tmp/mnt/lustre
-			tar -cf - . --exclude=./striped_dir \
-				    --exclude=./striped_dir_old \
-				    --exclude=./remote_dir |
+			tar -c --exclude=./striped_dir \
+				--exclude=./striped_dir_old \
+				--exclude=./remote_dir -f - .|
 				tar -xvf - -C striped_dir 1>/dev/null || {
 				error_noexit "cp to striped dir failed"
 				return 1
@@ -6123,7 +6123,7 @@ test_83() {
 		error "format ost1 error"
 
 	if ! test -b $dev; then
-		mnt_opts=$(csa_add "$OST_MOUNT_OPTS" -o loop)
+		mnt_opts=$(csa_add "$OST_MOUNT_FS_OPTS" -o loop)
 	fi
 	echo "mnt_opts $mnt_opts"
 	do_facet ost1 mount -t "$ost1_FSTYPE" $dev \
@@ -8353,6 +8353,14 @@ test_115() {
 	IMAGESIZE=$((3072 << 30)) # 3072 GiB
 
 	stopall
+
+	echo "client1: "
+	lctl dl
+	mount | grep lustre
+	echo "mds1: "
+	do_facet mds1 "hostname; ifconfig; lctl dl; mount"
+	echo "ost1: "
+	do_facet ost1 "hostname; ifconfig; lctl dl; mount"
 	# We need MDT size 3072GB, because it is smallest
 	# partition that can store 2B inodes
 	do_facet $SINGLEMDS "mkdir -p $TMP/$tdir"
@@ -8365,9 +8373,9 @@ test_115() {
 	local mdsdev=$(do_facet $SINGLEMDS "losetup -f")
 	do_facet $SINGLEMDS "losetup $mdsdev $mdsimgname"
 
-	local mds_opts="$(mkfs_opts mds1 $(mdsdevname 1)) --device-size=$IMAGESIZE   \
+	local mds_opts="$(mkfs_opts mds1 $(mdsdevname 1))	 \
 		--mkfsoptions='-O ea_inode,^resize_inode,meta_bg \
-		-N 2247484000 -E lazy_itable_init'"
+		-N 2247484000 -E lazy_itable_init' --device-size=$IMAGESIZE"
 	add mds1 $mds_opts --mgs --reformat $mdsdev ||
 		skip_env "format large MDT failed"
 	opts="$(mkfs_opts ost1 $(ostdevname 1)) \