stale_response.test.py: address log wait flakiness#13323
Open
bneradt wants to merge 1 commit into
Open
Conversation
bneradt
force-pushed
the
fix-stale-response-log-wait
branch
from
c71c621 to
3826654
Compare
bneradt
force-pushed
the
fix-stale-response-log-wait
branch
from
3826654 to
4437425
Compare
The stale_response log checks can run before every directive that they later assert has been written. Waiting for one marker with a sleep-based process leaves the final content checks exposed to ATS log flush timing when both stale directives are expected. This replaces the sleep-based watcher with explicit await runs for each directive being asserted. The test now waits for the matching stale-while-revalidate and stale-if-error entries before performing the final log content checks. Fixes: apache#13301
bneradt
force-pushed
the
fix-stale-response-log-wait
branch
from
4437425 to
86d058e
Compare
moonchen
approved these changes
Jul 2, 2026
moonchen
left a comment
moonchen
left a comment
Contributor
There was a problem hiding this comment.
Change looks good. One optional suggestion below.
Comment on lines
+146
to
+151
| def expect_log_entry(pattern: str, description: str, still_running_after: bool = False) -> None: | ||
| tr = Test.AddAwaitFileContainsTestRun(f"Await {description}", self._ts.Disk.stale_responses_log.AbsPath, pattern) | ||
| tr.StillRunningBefore = self._ts | ||
| if still_running_after: | ||
| tr.StillRunningAfter = self._ts | ||
| self._ts.Disk.stale_responses_log.Content += Testers.ContainsExpression(pattern, f"Verify {description}") |
Contributor
There was a problem hiding this comment.
The old waiter run set StillRunningAfter = self._ts in every branch; with the flag, the FORCE_SWR/FORCE_SIE variants no longer check that ATS is still alive after the directive is flushed. Setting it unconditionally restores that and removes the asymmetry.
Suggested change
| def expect_log_entry(pattern: str, description: str, still_running_after: bool = False) -> None: | |
| tr = Test.AddAwaitFileContainsTestRun(f"Await {description}", self._ts.Disk.stale_responses_log.AbsPath, pattern) | |
| tr.StillRunningBefore = self._ts | |
| if still_running_after: | |
| tr.StillRunningAfter = self._ts | |
| self._ts.Disk.stale_responses_log.Content += Testers.ContainsExpression(pattern, f"Verify {description}") | |
| def expect_log_entry(pattern: str, description: str) -> None: | |
| tr = Test.AddAwaitFileContainsTestRun(f"Await {description}", self._ts.Disk.stale_responses_log.AbsPath, pattern) | |
| tr.StillRunningBefore = self._ts | |
| tr.StillRunningAfter = self._ts | |
| self._ts.Disk.stale_responses_log.Content += Testers.ContainsExpression(pattern, f"Verify {description}") |
| p.Command = 'echo "Waiting upon the stale response log."' | ||
| p.StartBefore(log_waiter) | ||
| p.StillRunningAfter = self._ts | ||
| expect_log_entry(swr_log_pattern, "stale-while-revalidate directive is logged", still_running_after=True) |
Contributor
There was a problem hiding this comment.
(goes with the helper change above)
Suggested change
| expect_log_entry(swr_log_pattern, "stale-while-revalidate directive is logged", still_running_after=True) | |
| expect_log_entry(swr_log_pattern, "stale-while-revalidate directive is logged") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The stale_response log checks can run before every directive that
they later assert has been written. Waiting for one marker with a
sleep-based process leaves the final content checks exposed to ATS log
flush timing when both stale directives are expected.
This replaces the sleep-based watcher with explicit await runs for each
directive being asserted. The test now waits for the matching
stale-while-revalidate and stale-if-error entries before performing the
final log content checks.
Fixes: #13301