This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new c52eeda1b8 fedora:44: Trim remap ACL reload waits (#13237)
c52eeda1b8 is described below
commit c52eeda1b85149d7b1ddda091baf918a6816da91
Author: Brian Neradt <[email protected]>
AuthorDate: Thu Jun 4 16:32:14 2026 -0500
fedora:44: Trim remap ACL reload waits (#13237)
The remap ACL AuTests run hundreds of reload scenarios in a single case,
and the Fedora 44 shard is sensitive to extra reload-wait overhead,
causing the tests to hang. Their reload sentinel also counted only
explicit reloads, even though the log contains the startup load marker
too.
This replaces the long-lived sleep Ready helper with a short command
that exits once the expected reload marker count is present. This also
waits for the startup marker plus the explicit reload count, so each
scenario observes the reload it just requested.
---
tests/gold_tests/remap/remap_acl.test.py | 12 ++--
tests/gold_tests/remap_yaml/remap_acl_yaml.test.py | 12 ++--
tests/tools/condwait | 66 ++++++++++++++++++----
3 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/tests/gold_tests/remap/remap_acl.test.py
b/tests/gold_tests/remap/remap_acl.test.py
index 6aec7b8ad3..0f5b0f5f23 100644
--- a/tests/gold_tests/remap/remap_acl.test.py
+++ b/tests/gold_tests/remap/remap_acl.test.py
@@ -166,13 +166,13 @@ class Test_remap_acl:
#
tr = Test.AddTestRun("Await config reload")
p = tr.Processes.Default
- p.Command = 'echo awaiting config reload'
- p.Env = ts.Env
Test_remap_acl._ts_reload_counter += 1
- count = Test_remap_acl._ts_reload_counter
- await_config_reload =
tr.Processes.Process(f'config_reload_succeeded_{count}', 'sleep 30')
- await_config_reload.Ready =
When.FileContains(ts.Disk.diags_log.Name, "remap.config finished loading",
count)
- p.StartBefore(await_config_reload)
+ count = 1 + Test_remap_acl._ts_reload_counter
+ condwait = os.path.join(Test.Variables.AtsTestToolsDir, 'condwait')
+ p.Command = (f"'{condwait}' 30 --contains
'{ts.Disk.diags_log.Name}' "
+ f"'remap.config finished loading' {count}")
+ p.Env = ts.Env
+ tr.StillRunningAfter = ts
else:
record_config = {
diff --git a/tests/gold_tests/remap_yaml/remap_acl_yaml.test.py
b/tests/gold_tests/remap_yaml/remap_acl_yaml.test.py
index a200fa229a..edb6d04386 100644
--- a/tests/gold_tests/remap_yaml/remap_acl_yaml.test.py
+++ b/tests/gold_tests/remap_yaml/remap_acl_yaml.test.py
@@ -175,13 +175,13 @@ class Test_remap_acl:
#
tr = Test.AddTestRun("Await config reload")
p = tr.Processes.Default
- p.Command = 'echo awaiting config reload'
- p.Env = ts.Env
Test_remap_acl._ts_reload_counter += 1
- count = Test_remap_acl._ts_reload_counter
- await_config_reload =
tr.Processes.Process(f'config_reload_succeeded_{count}', 'sleep 30')
- await_config_reload.Ready =
When.FileContains(ts.Disk.diags_log.Name, "remap.yaml finished loading", count)
- p.StartBefore(await_config_reload)
+ count = 1 + Test_remap_acl._ts_reload_counter
+ condwait = os.path.join(Test.Variables.AtsTestToolsDir, 'condwait')
+ p.Command = (f"'{condwait}' 30 --contains
'{ts.Disk.diags_log.Name}' "
+ f"'remap.yaml finished loading' {count}")
+ p.Env = ts.Env
+ tr.StillRunningAfter = ts
else:
record_config = {
diff --git a/tests/tools/condwait b/tests/tools/condwait
index 0f208f168f..2a627f9889 100755
--- a/tests/tools/condwait
+++ b/tests/tools/condwait
@@ -23,6 +23,7 @@
#
# CONDITION is the ('test' command) condition to wait for. (It may contain
white space.)
# For file existence tests (-f, -e, -d), glob patterns are supported (e.g., -f
/path/crash-*.log).
+# Use "--contains FILE PATTERN COUNT" to wait until FILE contains PATTERN in
at least COUNT lines.
#
# MAX-WAIT is the maximum number of seconds to wait for the condition. If it
is omitted, it defaults to 60.
#
@@ -34,8 +35,13 @@
WAIT=60
POST_WAIT=0
+usage() {
+ echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDITION" >&2
+ echo " condwait [ MAX-WAIT [ POST-WAIT ] ] --contains FILE PATTERN
COUNT" >&2
+}
+
if [[ "$1" = "" ]] ; then
- echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDTION" >&2
+ usage
exit 1
fi
@@ -44,7 +50,7 @@ if [[ "$X" = "$1" ]] ; then
WAIT=$1
shift
if [[ "$1" = "" ]] ; then
- echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDTION" >&2
+ usage
exit 1
fi
X=$( echo "$1" | sed 's/x/yy/g' | sed 's/[^0-9]/x/g' )
@@ -55,24 +61,64 @@ if [[ "$X" = "$1" ]] ; then
fi
if [[ "$1" = "" ]] ; then
- echo "usage: condwait [ MAX-WAIT [ POST-WAIT ] ] TEST-CONDTION" >&2
+ usage
exit 1
fi
-# Check if this is a simple file existence test (-f, -e, -d). If so, use ls -d
-# which handles glob patterns properly. Otherwise, use test for the condition.
+if [[ "$1" = "--contains" ]]; then
+ if [[ $# -ne 4 ]] || ! [[ "$4" =~ ^[0-9]+$ ]]; then
+ usage
+ exit 1
+ fi
+fi
+
+# Check simple file existence tests (-f, -e, -d) specially so literal paths
with
+# whitespace work while glob patterns remain supported.
check_condition() {
- if [[ "$1" = "-f" || "$1" = "-e" || "$1" = "-d" ]] && [[ $# -eq 2 ]]; then
- # Use ls -d for file existence tests to support glob patterns.
- ls -d $2 >/dev/null 2>&1
+ if [[ "$1" = "--contains" ]]; then
+ [[ -f "$2" ]] || return 1
+ local matches
+ matches=$(awk -v pattern="$3" -v expected="$4" '
+ BEGIN {
+ if (expected == 0) {
+ print 0
+ found = 1
+ exit
+ }
+ }
+ index($0, pattern) {
+ count++
+ if (count >= expected) {
+ print count
+ found = 1
+ exit
+ }
+ }
+ END {
+ if (!found) {
+ print count + 0
+ }
+ }
+ ' "$2")
+ (( matches >= $4 ))
+ elif [[ "$1" = "-f" || "$1" = "-e" || "$1" = "-d" ]] && [[ $# -eq 2 ]];
then
+ if [[ "$2" = *[\*\?\[]* ]]; then
+ # Use compgen for file existence tests to support glob patterns.
+ local match
+ while IFS= read -r match; do
+ test "$1" "$match" && return 0
+ done < <(compgen -G "$2")
+ return 1
+ fi
+ test "$1" "$2"
else
- test $*
+ test "$@"
fi
}
while (( WAIT > 0 ))
do
- if check_condition $*
+ if check_condition "$@"
then
if (( POST_WAIT > 0 ))
then
