X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=7088394f9ba53144e6d5b639aa2b59124c7fa623;hp=371776dc6284c2c05bf95ecd347ff577dd43d3ae;hb=c14e6d47b216e6dab4b8c6ed4f491e700ce19367;hpb=cae71501680330a38c9bb16c25bf9c85dc0ec4e0;ds=sidebyside

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 371776d..7088394 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -23,10 +23,6 @@ is_sles11()						# LU-2181
 	return 1
 }
 
-if is_sles11; then					# LU-2181
-	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 23a 34b"
-fi
-
 if [ "$FAILURE_MODE" = "HARD" ]; then
 	CONFIG_EXCEPTIONS="24a " &&
 	echo "Except the tests: $CONFIG_EXCEPTIONS for " \
@@ -68,8 +64,12 @@ OSTDEV1_2=$fs2ost_DEV
 OSTDEV2_2=$fs3ost_DEV
 
 if ! combined_mgs_mds; then
-    # bug number for skipped test:    23954
-    ALWAYS_EXCEPT="$ALWAYS_EXCEPT       24b"
+	# bug number for skipped test: LU-9860 LU-9860 LU-9860
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT  43b     53b     54b"
+	# bug number for skipped test: LU-9875 LU-9879 LU-9879 LU-9879 LU-9879
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT  70e     80      84      87      100"
+	# bug number for skipped test: LU-8110 LU-9400 LU-9879 LU-9879 LU-9879
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT  102     103     104     105     107"
 fi
 
 # pass "-E lazy_itable_init" to mke2fs to speed up the formatting time
@@ -255,7 +255,9 @@ cleanup_nocli() {
 }
 
 cleanup() {
-	umount_client $MOUNT || return 200
+	local force=""
+	[ "x$1" != "x" ] && force='-f'
+	umount_client $MOUNT $force|| return 200
 	cleanup_nocli || return $?
 }
 
@@ -487,7 +489,7 @@ run_test 5e "delayed connect, don't crash (bug 10268)"
 
 test_5f() {
 	if combined_mgs_mds ; then
-		skip "combined mgs and mds"
+		skip "needs separate mgs and mds"
 		return 0
 	fi
 
@@ -608,7 +610,7 @@ is_blkdev () {
 
 test_17() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -637,7 +639,7 @@ run_test 17 "Verify failed mds_postsetup won't fail assertion (2936) (should ret
 
 test_18() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -1193,7 +1195,7 @@ test_28a() { # LU-4221
 run_test 28a "set symlink parameters permanently with conf_param"
 
 test_29() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "needs >= 2 OSTs" && return
         setup > /dev/null 2>&1
 	start_ost2 || error "Unable to start OST2"
 	sleep 10
@@ -2407,15 +2409,20 @@ test_33a() { # bug 12333, was test_33
 		mkfsoptions="--mkfsoptions=\\\"-J size=8\\\"" # See bug 17931.
 	fi
 
-	add fs2mds $(mkfs_opts mds1 ${fs2mdsdev}) --mgs --fsname=${FSNAME2} \
-		--reformat $mkfsoptions $fs2mdsdev $fs2mdsvdev || exit 10
+	if combined_mgs_mds; then
+		local mgs_flag="--mgs"
+	fi
+
+	add fs2mds $(mkfs_opts mds1 ${fs2mdsdev}) --fsname=${FSNAME2} \
+		--reformat $mgs_flag $mkfsoptions $fs2mdsdev $fs2mdsvdev ||
+		exit 10
 	add fs2ost $(mkfs_opts ost1 ${fs2ostdev}) --mgsnode=$MGSNID \
 		--fsname=${FSNAME2} --index=8191 --reformat $fs2ostdev \
 		$fs2ostvdev || exit 10
 
 	start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && trap cleanup_fs2 EXIT INT
 	start fs2ost $fs2ostdev $OST_MOUNT_OPTS
-	do_facet $SINGLEMDS "$LCTL conf_param $FSNAME2.sys.timeout=200" ||
+	do_facet mgs "$LCTL conf_param $FSNAME2.sys.timeout=200" ||
 		error "$LCTL conf_param $FSNAME2.sys.timeout=200 failed"
 	mkdir -p $MOUNT2 || error "mkdir $MOUNT2 failed"
 	$MOUNT_CMD $MGSNID:/${FSNAME2} $MOUNT2 || error "$MOUNT_CMD failed"
@@ -2617,7 +2624,7 @@ test_35b() { # bug 18674
 run_test 35b "Continue reconnection retries, if the active server is busy"
 
 test_36() { # 12743
-	[ $OSTCOUNT -lt 2 ] && skip_env "skipping test for single OST" && return
+	[ $OSTCOUNT -lt 2 ] && skip_env "needs >= 2 OSTs" && return
 
 	[ "$ost_HOST" = "`hostname`" -o "$ost1_HOST" = "`hostname`" ] ||
 		{ skip "remote OST" && return 0; }
@@ -2706,7 +2713,7 @@ test_37() {
 	local rc=0
 
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Currently only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -2890,7 +2897,7 @@ test_41b() {
 	echo "blah blah" > $MOUNT/$tfile
 	cat $MOUNT/$tfile || error "cat $MOUNT/$tfile failed"
 
-	umount_client $MOUNT || error "umount_client $MOUNT failed"
+	umount_client $MOUNT -f || error "umount_client $MOUNT failed"
 	stop_ost || error "Unable to stop OST1"
 	stop_mds || error "Unable to stop MDS"
 	stop_mds || error "Unable to stop MDS on second try"
@@ -3684,7 +3691,7 @@ test_50f() {
 run_test 50f "normal statfs one server in down"
 
 test_50g() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "needs >=2 OSTs" && return
 	setup
 	start_ost2 || error "Unable to start OST2"
         wait_osc_import_state mds ost2 FULL
@@ -3715,7 +3722,7 @@ run_test 50g "deactivated OST should not cause panic"
 # LU-642
 test_50h() {
 	# prepare MDT/OST, make OSC inactive for OST1
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "needs >=2 OSTs" && return
 
 	[ $(facet_fstype ost1) == zfs ] && import_zpool ost1
 	do_facet ost1 "$TUNEFS --param osc.active=0 `ostdevname 1`" ||
@@ -3753,7 +3760,7 @@ run_test 50h "LU-642: activate deactivated OST"
 
 test_50i() {
 	# prepare MDT/OST, make OSC inactive for OST1
-	[ "$MDSCOUNT" -lt "2" ] && skip_env "$MDSCOUNT < 2, skipping" && return
+	[ "$MDSCOUNT" -lt "2" ] && skip_env "needs >= 2 MDTs" && return
 
 	load_modules
 	[ $(facet_fstype mds2) == zfs ] && import_zpool mds2
@@ -3886,7 +3893,7 @@ diff_files_xattrs()
 
 test_52() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -4105,7 +4112,7 @@ run_test 53b "check MDS thread count params"
 
 test_54a() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -4117,7 +4124,7 @@ run_test 54a "test llverdev and partial verify of device"
 
 test_54b() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -4135,7 +4142,7 @@ lov_objid_size()
 
 test_55() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -4403,7 +4410,7 @@ test_60() { # LU-471
 	local num
 
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -4513,7 +4520,7 @@ run_test 61 "large xattr"
 
 test_62() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -4537,7 +4544,7 @@ run_test 62 "start with disabled journal"
 
 test_63() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based MDTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -4581,7 +4588,7 @@ run_test 64 "check lfs df --lazy "
 test_65() { # LU-2237
 	# Currently, the test is only valid for ldiskfs backend
 	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
-		skip "non-ldiskfs backend" && return
+		skip "ldiskfs only test" && return
 
 	local devname=$(mdsdevname ${SINGLEMDS//mds/})
 	local brpt=$(facet_mntpt brpt)
@@ -5022,6 +5029,7 @@ test_70e() {
 	soc=$(do_facet mds1 "$LCTL get_param -n \
 		mdt.*MDT0000.sync_lock_cancel")
 	[ $soc == "never" ] || error "SoC enabled on single MDS"
+	umount_client $MOUNT -f > /dev/null
 
 	cleanup || error "cleanup failed with $?"
 }
@@ -5446,7 +5454,7 @@ run_test 77 "comma-separated MGS NIDs and failover node NIDs"
 test_78() {
 	[[ $(facet_fstype $SINGLEMDS) != ldiskfs ||
 	   $(facet_fstype ost1) != ldiskfs ]] &&
-		skip "only applicable to ldiskfs-based MDTs and OSTs" && return
+		skip "ldiskfs only test" && return
 
 	# reformat the Lustre filesystem with a smaller size
 	local saved_MDSCOUNT=$MDSCOUNT
@@ -5705,7 +5713,7 @@ restore_ostindex() {
 test_81() { # LU-4665
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.54) ]] ||
 		{ skip "Need MDS version at least 2.6.54" && return; }
-	[[ $OSTCOUNT -ge 3 ]] || { skip_env "Need at least 3 OSTs" && return; }
+	[[ $OSTCOUNT -ge 3 ]] || { skip_env "needs >= 3 OSTs" && return; }
 
 	stopall
 
@@ -5767,7 +5775,7 @@ run_test 81 "sparse OST indexing"
 test_82a() { # LU-4665
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.54) ]] ||
 		{ skip "Need MDS version at least 2.6.54" && return; }
-	[[ $OSTCOUNT -ge 3 ]] || { skip_env "Need at least 3 OSTs" && return; }
+	[[ $OSTCOUNT -ge 3 ]] || { skip_env "needs >= 3 OSTs" && return; }
 
 	stopall
 
@@ -5875,7 +5883,7 @@ cleanup_82b() {
 test_82b() { # LU-4665
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.54) ]] ||
 		{ skip "Need MDS version at least 2.6.54" && return; }
-	[[ $OSTCOUNT -ge 4 ]] || { skip_env "Need at least 4 OSTs" && return; }
+	[[ $OSTCOUNT -ge 4 ]] || { skip_env "needs >= 4 OSTs" && return; }
 
 	stopall
 
@@ -5966,7 +5974,7 @@ test_83() {
 	[[ $(lustre_version_code ost1) -ge $(version_code 2.6.91) ]] ||
 		{ skip "Need OST version at least 2.6.91" && return 0; }
 	if [ $(facet_fstype ost1) != ldiskfs ]; then
-		skip "Only applicable to ldiskfs-based OSTs"
+		skip "ldiskfs only test"
 		return
 	fi
 
@@ -6144,7 +6152,7 @@ test_87() { #LU-6544
 	[[ $(lustre_version_code $SINGLEMDS1) -ge $(version_code 2.9.51) ]] ||
 		{ skip "Need MDS version at least 2.9.51" && return; }
 	[[ $(facet_fstype $SINGLEMDS) != ldiskfs ]] &&
-		{ skip "Only applicable to ldiskfs-based MDTs" && return; }
+		{ skip "ldiskfs only test" && return; }
 	[[ $OSTCOUNT -gt 59 ]] &&
 		{ skip "Ignore wide striping situation" && return; }
 
@@ -7128,7 +7136,7 @@ run_test 98 "Buffer-overflow check while parsing mount_opts"
 test_99()
 {
 	[[ $(facet_fstype ost1) != ldiskfs ]] &&
-		{ skip "Only applicable to ldiskfs-based OSTs" && return; }
+		{ skip "ldiskfs only test" && return; }
 	[[ $(lustre_version_code ost1) -ge $(version_code 2.8.57) ]] ||
 		{ skip "Need OST version at least 2.8.57" && return 0; }
 
@@ -7154,7 +7162,7 @@ test_99()
 	do_facet ost1 $DEBUGFS -c -R stats `ostdevname 1` | grep "meta_bg" ||
 		error "meta_bg is not set"
 
-	return 0
+	reformat
 }
 run_test 99 "Adding meta_bg option"
 
@@ -7431,7 +7439,7 @@ error_and_umount() {
 }
 
 test_105() {
-	cleanup
+	cleanup -f
 	reformat
 	setup
 	mkdir -p $TMP/$tdir
@@ -7462,6 +7470,32 @@ test_105() {
 }
 run_test 105 "check file creation for ro and rw bind mnt pt"
 
+test_106() {
+	local repeat=5
+
+	reformat
+	setupall
+	mkdir -p $DIR/$tdir || error "create $tdir failed"
+	lfs setstripe -c 1 -i 0 $DIR/$tdir
+#define OBD_FAIL_CAT_RECORDS                        0x1312
+	do_facet mds1 $LCTL set_param fail_loc=0x1312 fail_val=$repeat
+
+	for ((i = 1; i <= $repeat; i++)); do
+
+		#one full plain llog
+		createmany -o $DIR/$tdir/f- 64768
+
+		createmany -u $DIR/$tdir/f- 64768
+	done
+	wait_delete_completed $((TIMEOUT * 7))
+#ASSERTION osp_sync_thread() ( thread->t_flags != SVC_RUNNING ) failed
+#shows that osp code is buggy
+	do_facet mds1 $LCTL set_param fail_loc=0 fail_val=0
+
+	cleanupall
+}
+run_test 106 "check osp llog processing when catalog is wrapped"
+
 test_107() {
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.50) ]] ||
 		{ skip "Need MDS version > 2.10.50"; return; }