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

diff --git a/lustre/tests/lfsck-performance.sh b/lustre/tests/lfsck-performance.sh
index d9ace79..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() {
@@ -180,7 +180,7 @@ 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
@@ -932,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
 
@@ -1041,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