From de20a5d3ba8795015b2bf0be024cd7042e29af57 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Fri, 21 Feb 2020 17:40:17 +0300 Subject: [PATCH] LU-13282 tests: wait $LFSCK_BG_PID properly ha.sh fails with: wait: pid $LFSCK_BG_PID is not a child of this shell because wait $LFSCK_BG_PID duplicates wait in ha_stop_loads(). Patch fixes this issue. Test-Parameters: trivial Cray-bug-id: LUS-7930 Signed-off-by: Elena Gryaznova Reviewed-by: Alexander Boyko Reviewed-by: Vladimir Saveliev Change-Id: Ifdeab0dc570e9da889ccb34c0b47473e1077bfdc Reviewed-on: https://review.whamcloud.com/37668 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Vladimir Saveliev Reviewed-by: Alexander Boyko Reviewed-by: Oleg Drokin --- lustre/tests/ha.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lustre/tests/ha.sh b/lustre/tests/ha.sh index 05a9087..347e3f3 100755 --- 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 -- 1.8.3.1