From: Jian Yu Date: Tue, 4 May 2021 06:23:36 +0000 (-0700) Subject: EX-2992 tests: add sleep to verify lamigo and lpurge params X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=02a944e275eee9df8a3a04c86cdbe5bb066333df;p=fs%2Flustre-release.git EX-2992 tests: add sleep to verify lamigo and lpurge params This patch improves verify_one_lamigo_param() and verify_one_lpurge_param() in hot-pools.sh to try more times while verifying lamigo and lpurge params in case there is a latency time for the param(s) to be updated. Test-Parameters: trivial testlist=hot-pools \ env=HOT_POOLS_EXCEPT="56" Test-Parameters: trivial clientdistro=el8.3 \ testlist=hot-pools env=HOT_POOLS_EXCEPT="56" Test-Parameters: trivial clientdistro=sles15sp2 \ testlist=hot-pools env=HOT_POOLS_EXCEPT="56" Test-Parameters: trivial testgroup=review-dne-part-2 \ env=SANITY_LFSCK_EXCEPT="30",HOT_POOLS_EXCEPT="56" Lustre-change: https://review.whamcloud.com/43256 Lustre-commit: b465db8b9b99e217d175f31230d04e10a9a17906 Change-Id: I0f4818baa1c2cd87920ff3189461b45b53871e90 Signed-off-by: Jian Yu Reviewed-by: Andreas Dilger Reviewed-by: John L. Hammond Reviewed-on: https://review.whamcloud.com/43529 Tested-by: jenkins Tested-by: Maloo --- diff --git a/lustre/tests/hot-pools.sh b/lustre/tests/hot-pools.sh index d126dd4..349598b 100644 --- a/lustre/tests/hot-pools.sh +++ b/lustre/tests/hot-pools.sh @@ -507,15 +507,23 @@ verify_one_lamigo_param() { local param="$2" local expected="$3" local value + local max=30 + local j - value=$(dump_one_lamigo_stats $i | awk '/'$param':/ { print $2 }') + for ((j = 0; j < $max; j++)); do + value=$(dump_one_lamigo_stats $i | + awk '/'$param':/ { print $2 }') - [[ -n "$expected" ]] || { - echo "Default value '$value' is used for '$param'." - return 0 - } + [[ -n "$expected" ]] || { + echo "Default value '$value' is used for '$param'." + return 0 + } + + [[ "$value" != "$expected" ]] || break + sleep 1 + done - [[ "$value" = "$expected" ]] || { + (( j < max )) || { dump_one_lamigo_stats $i error "failed to verify '$param': '$value' != '$expected'" } @@ -875,15 +883,23 @@ verify_one_lpurge_param() { local param="$2" local expected="$3" local value + local max=30 + local j - value=$(dump_one_lpurge_stats $i | awk '/'$param':/ { print $2 }') + for ((j = 0; j < $max; j++)); do + value=$(dump_one_lpurge_stats $i | + awk '/'$param':/ { print $2 }') - [[ -n "$expected" ]] || { - echo "Default value '$value' is used for '$param'." - return 0 - } + [[ -n "$expected" ]] || { + echo "Default value '$value' is used for '$param'." + return 0 + } + + [[ "$value" != "$expected" ]] || break + sleep 1 + done - [[ "$value" = "$expected" ]] || { + (( j < max )) || { dump_one_lpurge_stats $i error "failed to verify '$param': '$value' != '$expected'" }