Skip to content

Flake batch 11: watcher-drain rewind test waits by time and yields - #1071

Merged
ualtinok merged 3 commits into
mainfrom
land/flake-batch-11
Oct 28, 2026
Merged

ualtinok merged 3 commits into
mainfrom
land/flake-batch-11

Conversation

@aft-alfonso

@aft-alfonso aft-alfonso Bot commented Oct 28, 2026 •

Copy link
Copy Markdown

#911's merge-queue run failed macOS libtest on runtime_drain::tests::budget_interrupted_stage_rewinds_when_unbind_lands_mid_stage (run 40609485775): after rebind the test called the bounded drain 32 times in about 150 ms, each reporting more work, and gave up.

The test's watcher is a manual channel with no platform watcher, so the more-work state can only come from the retained continuation re-parking. When the route is bound, the only park that makes no progress is a non-blocking LSP-manager try-lock while the language-server applicability worker (started by the first batch) holds it. The test's tight loop with no yield can starve that worker on a loaded runner. Production drains run on a cadence and retry, so they're unaffected.

The loop now yields between slices and is bounded by a 30 s deadline instead of a 32-slice count, matching the neighbouring rescan test. It still proves the replay finishes and both markers are indexed. Isolated runs passed before and after on macOS and Linux; the original failure needs shard load and was not reproduced. Test-only.


Summary by cubic

Fixes the flaky runtime_drain::tests::budget_interrupted_stage_rewinds_when_unbind_lands_mid_stage test that failed under shard load on macOS.

The bounded drain loop no longer spins up to 32 slices without yielding; it yields between slices and gives up after a 30 s deadline, matching the neighbouring rescan test. The tight loop could starve the language-server applicability worker that holds the manager try-lock, the only zero-progress park in the replay. The test still proves the replay finishes and both markers are indexed. Test-only, and adds the search-quality descriptor for flake batch 11.

Written for commit 0f72e21. Summary will update on new commits.

View guided diff Turn on auto-fix

ualtinok and others added 3 commits October 28, 2026 08:12
Co-authored-by: alfonso-aft <289616620+alfonso-aft@users.noreply.github.com>
(cherry picked from commit 96b96e5f9965085ae8ca7e6f172602aada7dfdd2)
Co-authored-by: alfonso-aft <289616620+alfonso-aft@users.noreply.github.com>
Co-authored-by: alfonso-aft <289616620+alfonso-aft@users.noreply.github.com>
@ualtinok
ualtinok force-pushed the land/flake-batch-11 branch from 25ef6f1 to 0f72e21 Compare October 28, 2026 07:13
@ualtinok
ualtinok added this pull request to the merge queue Oct 28, 2026
Merged via the queue into main with commit acaeeb8 Oct 28, 2026
93 checks passed
@ualtinok
ualtinok deleted the land/flake-batch-11 branch October 28, 2026 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant