From 9e4a92512f3c3803a555cba6668e73665b1f5701 Mon Sep 17 00:00:00 2001 From: Frank Sehr Date: Tue, 13 Aug 2024 13:29:15 -0700 Subject: [PATCH] LU-18047 lnet: sanity-lnet test_260 wrong value Increased timeout and retries. The test seem to fail randomly at different parameters, so it doesn't seem to be a configuration problem. It looks still more like a timeout problem. Other possibilties to try would be writing the default values in a file and execute the sysctl commands in one transaction with sysctl. An alternative would be trying to flush all buffered IO devices with sync. Test-Parameters: trivial testlist=sanity-lnet Signed-off-by: Frank Sehr Change-Id: I02be748d145a4ec2599c208b31bd0d8242eb6df1 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56025 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 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lustre/tests/sanity-lnet.sh b/lustre/tests/sanity-lnet.sh index 6f00628..3b46e67 100755 --- a/lustre/tests/sanity-lnet.sh +++ b/lustre/tests/sanity-lnet.sh @@ -4007,9 +4007,9 @@ check_sysctl() { fi echo "found: ${BASH_REMATCH[1]} ${value}" if [ "${value}" != "${BASH_REMATCH[2]}" ]; then - echo "Parameter ${BASH_REMATCH[1]} \ - wrong value: ${value} \ - expected: ${BASH_REMATCH[2]}" + echo "Parameter ${BASH_REMATCH[1]}" \ + " wrong value: ${value}" \ + " expected: ${BASH_REMATCH[2]}" return 2 fi fi @@ -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=3 + local -i max_retries=10 local -i retries=0 echo "Setting default values and create backup for check" @@ -4040,9 +4040,9 @@ test_260() { until check_sysctl "${sysctl_bak}" do if (( retries >= max_retries )); then - error "Values not set" + error "Default sysconfig values not set" fi - sleep 1 + sleep 3 retries+=1 done @@ -4067,9 +4067,9 @@ test_260() { until check_sysctl "${sysctl_file}" do if (( retries >= max_retries )); then - error "Values not set" + error "New sysctl values not set" fi - sleep 1 + sleep 3 retries+=1 done @@ -4087,9 +4087,9 @@ test_260() { until check_sysctl "${sysctl_bak}" do if (( retries >= max_retries )); then - error "Values not set" + error "Original sysconfig values not set" fi - sleep 1 + sleep 3 retries+=1 done -- 1.8.3.1