X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fscrub-performance.sh;h=a75daa7ab5f7808499674202f441fc093be1997f;hb=9d14a88232dc9deddeb3cec81343d4738477ecf0;hp=a43b860017868b08a4edc063656c52358951bf2b;hpb=a633afc625197c853d3da2ec6bfca94de8bcd5ac;p=fs%2Flustre-release.git

diff --git a/lustre/tests/scrub-performance.sh b/lustre/tests/scrub-performance.sh
index a43b860..a75daa7 100644
--- a/lustre/tests/scrub-performance.sh
+++ b/lustre/tests/scrub-performance.sh
@@ -13,13 +13,14 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-[ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
-	skip "OI scrub performance only for ldiskfs" && exit 0
-[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.2.90) ]] &&
-	skip "Need MDS version at least 2.2.90" && exit 0
-require_dsh_mds || exit 0
-[ "$SLOW" = "no" ] && skip "skip scrub performance test under non-SLOW mode"
+[ "$SLOW" = "no" ] &&
+	skip "skip scrub performance test under non-SLOW mode" && exit 0
 
+[ "$mds1_FSTYPE" != ldiskfs ] &&
+	skip "ldiskfs only test"
+[[ "$MDS1_VERSION" -lt $(version_code 2.2.90) ]] &&
+	skip "Need MDS version at least 2.2.90"
+require_dsh_mds || exit 0
 
 NTHREADS=${NTHREADS:-0}
 UNIT=${UNIT:-1048576}
@@ -40,11 +41,22 @@ if [ ${NTHREADS} -eq 0 ]; then
 	NTHREADS=$((CPUCORE * 2))
 fi
 
-stopall
+cleanupall
+
+if ! combined_mgs_mds ; then
+	do_rpc_nodes $(facet_active_host mgs) load_modules_local
+	add mgs $(mkfs_opts mgs $(mgsdevname)) --backfstype ldiskfs \
+		--reformat $(mgsdevname) $(mgsvdevname) ${quiet:+>/dev/null} ||
+		exit 1
+
+	start mgs $(mgsdevname) $MGS_MOUNT_OPTS || error "Fail to start MGS!"
+fi
+
 do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
 reformat_external_journal ${SINGLEMDS}
 add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS} ${MDT_DEVNAME}) --backfstype ldiskfs \
-	--reformat ${MDT_DEVNAME} $(mdsvdevname 1) > /dev/null || exit 2
+	--reformat ${MDT_DEVNAME} $(mdsvdevname 1) ${quiet:+>/dev/null} ||
+	exit 2
 
 scrub_attach() {
 	${ECHOCMD} "${LCTL} <<-EOF
@@ -85,8 +97,12 @@ scrub_create() {
 }
 
 scrub_cleanup() {
+	cleanupall
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) unload_modules
-	formatall
+	if ! combined_mgs_mds ; then
+		do_rpc_nodes $(facet_active_host mgs) unload_modules
+	fi
+	REFORMAT="yes" cleanup_and_setup_lustre
 }
 
 scrub_create_nfiles() {
@@ -180,4 +196,5 @@ run_test 0 "OI scrub performance test"
 # cleanup the system at last
 scrub_cleanup
 complete $SECONDS
+check_and_cleanup_lustre
 exit_status