From 7ee0efb2ee1a46f5d61c658cfb85e5f4acb2038f Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Mon, 22 Nov 2021 18:13:07 +0300 Subject: [PATCH] LU-15260 tests: numfailovers() fix Patch fixes numfailovers() to use comma separated MDTS list correctly. Without this fix in newer bash version we see the following error: line 69: mds1,mds2,mds3,mds4_nums: bad substitution Fixes: a7a2133bfa ("b=18696 new RECOVERY_RANDOM_SCALE test") Fixes: b594948509 ("TT-59 remove . and - from the node name") Test-Parameters: trivial testlist=recovery-random-scale Signed-off-by: Elena Gryaznova HPE-bug-id: LUS-10619 Change-Id: I4c28e3c62cada60dc1241948dc4e969e0e10ce9a Reviewed-on: https://review.whamcloud.com/45633 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Vladimir Saveliev Reviewed-by: Alexander Boyko Reviewed-by: Oleg Drokin --- lustre/tests/recovery-random-scale.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh index dc4c3ae..c3b2d4e 100644 --- a/lustre/tests/recovery-random-scale.sh +++ b/lustre/tests/recovery-random-scale.sh @@ -61,16 +61,16 @@ LOAD_PID_FILE=${LOAD_PID_FILE:-$TMP/client-load.pid} VMSTAT_PID_FILE=${VMSTAT_PID_FILE:-$TMP/vmstat.pid} numfailovers () { - local facet - local var - - for facet in $MDTS ${FAILED_CLIENTS//,/ }; do - var=${facet}_nums - val=${!var} - if [ "$val" ] ; then - echo "$facet failed over $val times" - fi - done + local facet + local var + + for facet in ${MDTS//,/ } ${FAILED_CLIENTS//,/ }; do + var=$(node_var_name $facet)_nums + val=${!var} + if [ "$val" ] ; then + echo "$facet failed over $val times" + fi + done } summary_and_cleanup () { @@ -168,8 +168,8 @@ test_fail_client_mds() { # lists are comma separated FAILED_CLIENTS=$(expand_list $FAILED_CLIENTS $fail_client) - serverfacet=$(get_random_entry $MDTS) - var=${serverfacet}_nums + serverfacet=$(get_random_entry $MDTS) + var=$(node_var_name $serverfacet)_nums # Check that our client loads are still running. If any have died, # that means they have died outside of recovery, which is unacceptable. -- 1.8.3.1