LU-11915 tests: use trusted.* xattr for conf-sanity test_115

[fs/lustre-release.git] / lustre / tests / scrub-performance.sh

diff --git a/lustre/tests/scrub-performance.sh b/lustre/tests/scrub-performance.sh
index 785335a..f04e08c 100644 (file)
--- a/lustre/tests/scrub-performance.sh
+++ b/lustre/tests/scrub-performance.sh
@@ -41,7 +41,7 @@ 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
@@ -97,12 +97,12 @@ scrub_create() {
 }
 
 scrub_cleanup() {
-       stopall
+       cleanupall
        do_rpc_nodes $(facet_active_host $SINGLEMDS) unload_modules
        if ! combined_mgs_mds ; then
                do_rpc_nodes $(facet_active_host mgs) unload_modules
        fi
-       formatall
+       REFORMAT="yes" cleanup_and_setup_lustre
 }
 
 scrub_create_nfiles() {
@@ -196,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