From 79372d86cd64c097cb4f46cb166ba716795619f6 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Tue, 22 Dec 2020 18:19:15 +0300 Subject: [PATCH] LU-14273 tests: enhance ha.sh to run custom cmd on bg We need this ability to run lfs migrate in parallel with mdtest and IOR. Test-Parameters: trivial Signed-off-by: Elena Gryaznova HPE-bug-id: LUS-9371 Reviewed-by: Vladimir Saveliev Reviewed-by: Andriy Skulysh Change-Id: Id52ed0731aba24d3f40813da5fd2bb9b94ae63e5 Reviewed-on: https://review.whamcloud.com/41073 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Vladimir Saveliev Reviewed-by: Andriy Skulysh Reviewed-by: Andrew Perepechko Reviewed-by: Oleg Drokin --- lustre/tests/ha.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lustre/tests/ha.sh b/lustre/tests/ha.sh index b7ada94..411337a 100755 --- a/lustre/tests/ha.sh +++ b/lustre/tests/ha.sh @@ -647,6 +647,26 @@ ha_start_nonmpi_loads() done } +declare ha_bgcmd=${ha_bgcmd:-""} +declare ha_bgcmd_log=$ha_tmp_dir/bgcmdlog + +ha_cmd_bg () { + [[ -z "$ha_bgcmd" ]] && return 0 + ha_bgcmd=${ha_bgcmd//"{}"/$ha_test_dir} + + ha_info "BG cmd: $ha_bgcmd" + while [ true ]; do + [ -f $ha_stop_file ] && + ha_info "$ha_stop_file found! $ha_bgcmd no started" && + break + eval $ha_bgcmd 2>&1 | tee -a $ha_bgcmd_log + sleep 1 + done & + CMD_BG_PID=$! + ha_info CMD BG PID: $CMD_BG_PID + ps aux | grep $CMD_BG_PID +} + ha_lfsck_bg () { rm -f $ha_lfsck_log rm -f $ha_lfsck_stop @@ -760,6 +780,7 @@ ha_lfsck_repaired() ha_start_loads() { + ha_cmd_bg $ha_lfsck_bg && ha_lfsck_bg trap ha_trap_stop_signals $ha_stop_signals ha_start_nonmpi_loads @@ -769,6 +790,7 @@ ha_start_loads() ha_stop_loads() { touch $ha_stop_file + [[ -n $CMD_BG_PID ]] && wait $CMD_BG_PID || true # true because of lfsck_bg could be stopped already $ha_lfsck_bg && wait $LFSCK_BG_PID || true trap - $ha_stop_signals -- 1.8.3.1