X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=d9c6d1396900051e4f1b033be03dc74361ddd7e1;hp=92f4c4fbd0dad0d6b310d537cc0d9c0c605a14ac;hb=b594948509f42859565d3ac141621b0f35d806d2;hpb=08ac163a04f0a9c5e4348174aa835796e2190e28 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 92f4c4f..d9c6d13 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1028,14 +1028,14 @@ check_progs_installed () { } # recovery-scale functions -client_var_name() { - echo __$(echo $1 | tr '-' 'X') +node_var_name() { + echo __$(echo $1 | tr '-' '_' | tr '.' '_') } start_client_load() { local client=$1 local load=$2 - local var=$(client_var_name $client)_load + local var=$(node_var_name $client)_load eval export ${var}=$load do_node $client "PATH=$PATH MOUNT=$MOUNT ERRORS_OK=$ERRORS_OK \ @@ -1066,7 +1066,7 @@ start_client_loads () { # only for remote client check_client_load () { local client=$1 - local var=$(client_var_name $client)_load + local var=$(node_var_name $client)_load local TESTLOAD=run_${!var}.sh ps auxww | grep -v grep | grep $client | grep -q "$TESTLOAD" || return 1 @@ -1140,7 +1140,7 @@ restart_client_loads () { check_client_load $client rc=${PIPESTATUS[0]} if [ "$rc" != 0 -a "$expectedfail" ]; then - local var=$(client_var_name $client)_load + local var=$(node_var_name $client)_load start_client_load $client ${!var} echo "Restarted client load ${!var}: on $client. Checking ..." check_client_load $client