X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flfsck-performance.sh;h=a7aee980f1bc269338b3a1c6461ff5b8148e505d;hb=a6239c48da38ff0da4564da496766deebc88923f;hp=f6d7a12cdca30037070e6e5748c383e88ae3bb97;hpb=75b426f9f9d3f21e08cd1e62b7fa4962a2b8c679;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lfsck-performance.sh b/lustre/tests/lfsck-performance.sh
index f6d7a12..a7aee98 100644
--- a/lustre/tests/lfsck-performance.sh
+++ b/lustre/tests/lfsck-performance.sh
@@ -17,7 +17,7 @@ require_dsh_mds || exit 0
 require_dsh_ost || exit 0
 
 [ "$SLOW" = "no" ] &&
-	skip "skip lfsck performance test under non-SLOW mode" && exit 0
+	skip "skip lfsck performance test under non-SLOW mode"
 
 NTHREADS=${NTHREADS:-0}
 UNIT=${UNIT:-8192}
@@ -90,7 +90,7 @@ lfsck_create() {
 
 lfsck_cleanup() {
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) unload_modules
-	formatall
+	REFORMAT="yes" cleanup_and_setup_lustre
 }
 
 lfsck_create_nfiles() {
@@ -131,11 +131,18 @@ lfsck_create_nfiles() {
 
 build_test_filter
 
+format_start_mgs () {
+	do_rpc_nodes $(facet_active_host mgs) load_modules_local
+	format_mgs
+	start mgs $(mgsdevname) $MGS_MOUNT_OPTS
+}
+
 test_0() {
 	local BCOUNT=0
 	local i
 
 	stopall
+	combined_mgs_mds || format_start_mgs
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
 	format_mdt $(facet_number $SINGLEMDS)
 
@@ -167,17 +174,19 @@ test_0() {
 		echo "lfsck_namespace speed is ${SPEED}/sec"
 		stop ${SINGLEMDS} > /dev/null || error "Fail to stop MDS!"
 	done
+	combined_mgs_mds || stop mgs
 }
 run_test 0 "lfsck namespace performance (routine case) without load"
 
 test_1() {
 	[ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
-		skip "not implemented for ZFS" && return
+		skip_env "not implemented for ZFS"
 
 	local BCOUNT=0
 	local i
 
 	stopall
+	combined_mgs_mds || format_start_mgs
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
 	format_mdt $(facet_number $SINGLEMDS)
 
@@ -220,6 +229,7 @@ test_1() {
 		echo "lfsck_namespace speed is ${SPEED}/sec"
 		stop ${SINGLEMDS} > /dev/null || error "Fail to stop MDS!"
 	done
+	combined_mgs_mds || stop mgs
 }
 run_test 1 "lfsck namespace performance (backup/restore) without load"
 
@@ -229,6 +239,7 @@ test_2() {
 	for ((i = $MINCOUNT_REPAIR; i <= $MAXCOUNT_REPAIR;
 	      i = $((i * FACTOR)))); do
 		stopall
+		combined_mgs_mds || format_start_mgs
 		do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
 		format_mdt $(facet_number $SINGLEMDS)
 
@@ -256,6 +267,7 @@ test_2() {
 		echo "lfsck_namespace speed is ${SPEED}/sec"
 		stop ${SINGLEMDS} > /dev/null || error "Fail to stop MDS!"
 	done
+	combined_mgs_mds || stop mgs
 }
 run_test 2 "lfsck namespace performance (upgrade from 1.8) without load"
 
@@ -267,6 +279,7 @@ test_3() {
 	local i
 
 	stopall
+	combined_mgs_mds || format_start_mgs
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
 	format_mdt $(facet_number $SINGLEMDS)
 
@@ -338,6 +351,7 @@ test_3() {
 	lfsck_create_nfiles ${nfiles} ${BCOUNT} ${NTHREADS} ||
 		error "Fail to create files!"
 	echo "+++ end to create for ${i} files set at: $(date) +++"
+	combined_mgs_mds || stop mgs
 }
 run_test 3 "lfsck namespace impact on create performance"
 
@@ -780,7 +794,7 @@ namespace_gen_one() {
 	echo "Creating $count 2-striped sub-dirs under $show_dir," \
 		"and 4 regular files under each striped sub-dir at: $(date)"
 	for ((m = 0; m < $count; m++)); do
-		$LFS setdirstripe -i ${idx1} -c 2 -t all_char \
+		$LFS setdirstripe -i ${idx1} -c 2 -H all_char \
 			$work_dir/d_s_${m} || {
 			error_noexit \
 			"(27) Fail to make striped-dir $work_dir/d_s_${m}"
@@ -918,7 +932,7 @@ test_7c() {
 run_test 7c "namespace LFSCK performance (repairing bad FID-in-dirent) for DNE"
 
 test_8() {
-	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	[ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs"
 
 	[ $INCFACTOR -gt 25 ] && INCFACTOR=25
 
@@ -1027,4 +1041,5 @@ run_test 8 "lfsck namespace impact on create performance"
 # cleanup the system at last
 lfsck_cleanup
 complete $SECONDS
+check_and_cleanup_lustre
 exit_status