LU-6429 tests: fix external journal usage

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

diff --git a/lustre/tests/lfsck-performance.sh b/lustre/tests/lfsck-performance.sh
index 3b6cc7d..0a326a0 100644 (file)
--- 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"
+       reformat_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))