From 3a6376d1a61ed68ece2591d71531a0c428705987 Mon Sep 17 00:00:00 2001 From: Frank Sehr Date: Fri, 13 Sep 2024 12:09:35 -0700 Subject: [PATCH] LU-18215 lnet: fix sanity-lnet/260 'Original values not set' error Increased timeout and retries again. Bypassed the the result check on the rest values. Resetting to the original values doesn't seem to be a use case that is applicable anyway since only the setting of new values is important. Test-Parameters: trivial testlist=sanity-lnet env=ONLY=260,ONLY_REPEAT=100 Signed-off-by: Frank Sehr Change-Id: I95fbe97efb2161d3991928d300f582077a2d5fff Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56358 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Serguei Smirnov Reviewed-by: Cyril Bordage Reviewed-by: Oleg Drokin --- lustre/tests/sanity-lnet.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lustre/tests/sanity-lnet.sh b/lustre/tests/sanity-lnet.sh index 3b46e67..8b0e8a9 100755 --- a/lustre/tests/sanity-lnet.sh +++ b/lustre/tests/sanity-lnet.sh @@ -4023,7 +4023,7 @@ test_260() { local sysctl_file="/etc/lnet-sysctl.conf" local sysctl_conf_bak="/etc/lnet-sysctl.bak" local sysctl_bak=$TMP/lnet-sysctl.bak - local -i max_retries=10 + local -i max_wait=60 local -i retries=0 echo "Setting default values and create backup for check" @@ -4039,10 +4039,10 @@ test_260() { retries=0 until check_sysctl "${sysctl_bak}" do - if (( retries >= max_retries )); then + if (( retries >= max_wait )); then error "Default sysconfig values not set" fi - sleep 3 + sleep 1 retries+=1 done @@ -4064,12 +4064,11 @@ test_260() { echo "Check new configuration" retries=0 - until check_sysctl "${sysctl_file}" - do - if (( retries >= max_retries )); then + until check_sysctl "${sysctl_file}"; do + if (( retries >= max_wait )); then error "New sysctl values not set" fi - sleep 3 + sleep 1 retries+=1 done @@ -4084,12 +4083,12 @@ test_260() { echo "Check original configuration" retries=0 - until check_sysctl "${sysctl_bak}" - do - if (( retries >= max_retries )); then - error "Original sysconfig values not set" + until check_sysctl "${sysctl_bak}"; do + if (( retries >= max_wait )); then + echo "Original sysconfig values not set" + break fi - sleep 3 + sleep 1 retries+=1 done -- 1.8.3.1