From 597bd3674ffa00a1ced21f66ef36f63e9b917c9e Mon Sep 17 00:00:00 2001 From: Hongchao Zhang Date: Fri, 7 Jul 2023 01:16:09 +0800 Subject: [PATCH] LU-16951 test: don't call echo in function call In sanity-quota, the call '$(get_slave_nr expr "foo")' will fail if there is "echo" call in "wait_update_facet/wait_update_cond". Test-Parameters: trivial Signed-off-by: Hongchao Zhang Change-Id: Ib35bf8ccd7eb121a0a2852ba7ed69ad9b01f271a Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51615 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- lustre/tests/sanity-quota.sh | 2 +- lustre/tests/test-framework.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index f9b40b4..42ae950 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -4823,7 +4823,7 @@ get_slave_nr() { local qtype=$2 local nr - wait_update_facet mds1 \ + wait_update_facet "--quiet" mds1 \ "$LCTL get_param -n qmt.$FSNAME-QMT0000.dt-$pool.info \ >/dev/null 2>&1 || echo foo" "">/dev/null || error "mds1: failed to create quota pool $pool" diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 59a6a96..313bfe6 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -3142,21 +3142,28 @@ wait_update_cond() { eval [[ "'$result'" $cond "'$expect'" ]] if [[ $? == 0 ]]; then + [[ -n "$quiet" ]] && return 0 [[ -z "$result" || $waited -le $sleep ]] || echo "Updated after ${waited}s: want '$expect' got '$result'" return 0 fi if [[ -n "$verbose" && "$result" != "$prev_result" ]]; then - [[ -n "$prev_result" ]] && + [[ -z "$quiet" && -n "$prev_result" ]] && echo "Changed after ${waited}s: from '$prev_result' to '$result'" prev_result="$result" fi - (( $waited % $print == 0 )) && + (( $waited % $print == 0 )) && { + [[ -z "$quiet" ]] && echo "Waiting $((max_wait - waited))s for '$expect'" + } + sleep $sleep waited=$((SECONDS - begin)) done + + [[ -z "$quiet" ]] && echo "Update not seen after ${max_wait}s: want '$expect' got '$result'" + return 3 } -- 1.8.3.1