X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flfsck-performance.sh;h=7b3d8cdaa14537adf1bad8dab9c35a071050ca27;hb=a2d5b2e83c0a512a3ea59698e8481621ab5856c2;hp=3b6cc7d6524a024a95d03bf625e4d5b3bad31a8b;hpb=db2110a7af734f42a3a0b425feade8498c309895;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lfsck-performance.sh b/lustre/tests/lfsck-performance.sh
index 3b6cc7d..7b3d8cd 100644
--- a/lustre/tests/lfsck-performance.sh
+++ b/lustre/tests/lfsck-performance.sh
@@ -137,10 +137,7 @@ test_0() {
 
 	stopall
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
-	reformat_external_journal
-	add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS} ${MDT_DEVNAME}) --backfstype \
-		$(facet_fstype ${SINGLEMDS}) --reformat ${MDT_DEVNAME} \
-		$(mdsvdevname 1) >/dev/null || error "Fail to reformat the MDS!"
+	format_mdt $(facet_number $SINGLEMDS)
 
 	for ((i = $MINCOUNT; i <= $MAXCOUNT; i = $((i * FACTOR)))); do
 		local nfiles=$((i - BCOUNT))
@@ -182,10 +179,7 @@ test_1() {
 
 	stopall
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
-	reformat_external_journal
-	add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS} ${MDT_DEVNAME}) --backfstype \
-		$(facet_fstype ${SINGLEMDS}) --reformat ${MDT_DEVNAME} \
-		$(mdsvdevname 1) > /dev/null || error "Fail to reformat the MDS"
+	format_mdt $(facet_number $SINGLEMDS)
 
 	for ((i = $MINCOUNT_REPAIR; i <= $MAXCOUNT_REPAIR;
 	      i = $((i * FACTOR)))); do
@@ -236,11 +230,7 @@ test_2() {
 	      i = $((i * FACTOR)))); do
 		stopall
 		do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
-		reformat_external_journal
-		add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS} ${MDT_DEVNAME}) \
-			--backfstype $(facet_fstype ${SINGLEMDS}) --reformat \
-			${MDT_DEVNAME} $(mdsvdevname 1) > /dev/null ||
-			error "Fail to reformat the MDS!"
+		format_mdt $(facet_number $SINGLEMDS)
 
 		echo "+++ start to create for ${i} files set at: $(date) +++"
 		lfsck_create_nfiles ${i} 0 ${NTHREADS} 1 ||
@@ -278,10 +268,7 @@ test_3() {
 
 	stopall
 	do_rpc_nodes $(facet_active_host $SINGLEMDS) load_modules_local
-	reformat_external_journal
-	add ${SINGLEMDS} $(mkfs_opts ${SINGLEMDS} ${MDT_DEVNAME}) --backfstype \
-		$(facet_fstype ${SINGLEMDS}) --reformat ${MDT_DEVNAME} \
-		$(mdsvdevname 1) > /dev/null || error "Fail to reformat the MDS"
+	format_mdt $(facet_number $SINGLEMDS)
 
 	for ((i = $inc_count; i <= $BASE_COUNT; i = $((i + inc_count)))); do
 		local nfiles=$((i - BCOUNT))