X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fscrub-performance.sh;h=0c90e45957cdb9817e53f2b670723eb4d2173d4f;hb=803a59b87d9b0de8c059447902db176dfd37a24a;hp=814a9195512952a86b90044cc116cbc81e724bb0;hpb=1e8ff9e1309b0dd777db872195bad033b73d638b;p=fs%2Flustre-release.git

diff --git a/lustre/tests/scrub-performance.sh b/lustre/tests/scrub-performance.sh
index 814a919..0c90e45 100644
--- a/lustre/tests/scrub-performance.sh
+++ b/lustre/tests/scrub-performance.sh
@@ -3,22 +3,26 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT="$SCRUB_PERFORMANCE_EXCEPT"
-[ "$SLOW" = "no" ] && EXCEPT_SLOW=""
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-[ "${MDSFSTYPE:-$FSTYPE}" != "ldiskfs" ] &&
-	skip "OI scrub performance only for ldiskfs" && exit 0
+ALWAYS_EXCEPT="$SCRUB_PERFORMANCE_EXCEPT"
+build_test_filter
+
+[ "$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:-0}
+UNIT=${UNIT:-1048576}
 BACKUP=${BACKUP:-0}
 MINCOUNT=${MINCOUNT:-8192}
 MAXCOUNT=${MAXCOUNT:-32768}
@@ -33,14 +37,25 @@ remote_mds && ECHOCMD=${RCMD} || ECHOCMD="eval"
 
 if [ ${NTHREADS} -eq 0 ]; then
 	CPUCORE=$(${RCMD} cat /proc/cpuinfo | grep "processor.*:" | wc -l)
-	NTHREADS=$((CPUCORE * 3))
+	NTHREADS=$((CPUCORE * 2))
+fi
+
+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
 
-stopall
 do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
-reformat_external_journal
-add $SINGLEMDS $(mkfs_opts $SINGLEMDS) --backfstype ldiskfs --reformat \
-	$MDT_DEVNAME > /dev/null || exit 2
+reformat_external_journal ${SINGLEMDS}
+add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS} ${MDT_DEVNAME}) --backfstype ldiskfs \
+	--reformat ${MDT_DEVNAME} $(mdsvdevname 1) ${quiet:+>/dev/null} ||
+	exit 2
 
 scrub_attach() {
 	${ECHOCMD} "${LCTL} <<-EOF
@@ -81,8 +96,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() {
@@ -115,8 +134,6 @@ scrub_create_nfiles() {
 	done
 }
 
-build_test_filter
-
 test_0() {
 	local BASECOUNT=0
 	local i
@@ -139,7 +156,8 @@ test_0() {
 		if [ ${BACKUP} -ne 0 ]; then
 			stime=$(date +%s)
 			echo "backup/restore ${i} files start at: $(date)"
-			mds_backup_restore || error "Fail to backup/restore!"
+			mds_backup_restore $SINGLEMDS ||
+				error "Fail to backup/restore!"
 			echo "backup/restore ${i} files end at: $(date)"
 			etime=$(date +%s)
 			delta=$((etime - stime))
@@ -147,7 +165,8 @@ test_0() {
 			echo "backup/restore ${i} files used ${delta} seconds"
 			echo "backup/restore speed is $((i / delta))/sec"
 		else
-			mds_remove_ois || error "Fail to remove/recreate!"
+			mds_remove_ois $SINGLEMDS ||
+				error "Fail to remove/recreate!"
 		fi
 
 		echo "--- start to rebuild OI for $i files set at: $(date) ---"
@@ -173,5 +192,6 @@ run_test 0 "OI scrub performance test"
 
 # cleanup the system at last
 scrub_cleanup
-complete $(basename $0) $SECONDS
+complete $SECONDS
+check_and_cleanup_lustre
 exit_status