LU-13321 tests: force even DNE file distribution

[fs/lustre-release.git] / lustre / tests / ha.sh

diff --git a/lustre/tests/ha.sh b/lustre/tests/ha.sh
index 05a9087..347e3f3 100755 (executable)
--- a/lustre/tests/ha.sh
+++ b/lustre/tests/ha.sh
@@ -700,17 +700,20 @@ ha_lfsck_repaired()
 
 ha_start_loads()
 {
-    trap ha_trap_stop_signals $ha_stop_signals
-    ha_start_nonmpi_loads
-    ha_start_mpi_loads
+       $ha_lfsck_bg && ha_lfsck_bg
+       trap ha_trap_stop_signals $ha_stop_signals
+       ha_start_nonmpi_loads
+       ha_start_mpi_loads
 }
 
 ha_stop_loads()
 {
-    touch $ha_stop_file
-    trap - $ha_stop_signals
-    ha_info "Waiting for workloads to stop"
-    wait
+       touch $ha_stop_file
+       # true because of lfsck_bg could be stopped already
+       $ha_lfsck_bg && wait $LFSCK_BG_PID || true
+       trap - $ha_stop_signals
+       ha_info "Waiting for workloads to stop"
+       wait
 }
 
 ha_wait_loads()
@@ -914,8 +917,6 @@ ha_main()
        ha_on ${ha_clients[0]} " \
                $LFS setstripe $ha_stripe_params $ha_test_dir"
 
-       $ha_lfsck_bg && ha_lfsck_bg
-
        ha_start_loads
        ha_wait_loads
 
@@ -932,9 +933,6 @@ ha_main()
 
        $ha_lfsck_fail_on_repaired && ha_lfsck_repaired
 
-       # true because of lfsck_bg could be stopped already
-       $ha_lfsck_bg && wait $LFSCK_BG_PID || true
-
        if [ -e "$ha_fail_file" ]; then
                exit 1
        else