Increase Merge_ConcurrentWithMemoryTypes_ThreadSafe timeout to 30s - #66
Merged
saguiitay merged 1 commit intoMay 1, 2026
Merged
Conversation
The 5 second Task.WaitAll budget was too tight for shared CI runners. Locally the merges complete in tens of milliseconds, but on a cold ubuntu-latest runner under contention this test recently timed out exactly at the 5 s mark on net8.0 (PR #65 / run 25215421113), reporting 'Merges should complete without deadlock' even though no deadlock existed. Bumped the budget to 30 s, matching the deadlock-detection budget used by Merge_CrossPairs_HighConcurrency_DoesNotDeadlock. This still fails fast on a real deadlock while eliminating the flake. Test-only change; no production code touched, so no PackageReleaseNotes entry. No version bump (accumulates on version-1.15). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
Issue
CI run 25215421113 on PR #65 (version-1.15 → master) reported one failed test on net8.0:
The duration matches the
Task.WaitAll(mergeTasks, TimeSpan.FromSeconds(5))budget exactly — the test timed out rather than detecting an actual deadlock. Locally on Windows the same test takes ~25 ms (200x under budget). The 5 s budget is too tight for a cold ubuntu-latest runner under contention.Fix
Bumped the budget to 30 s (
ConcurrentCardinalityEstimatorMemoryTests.cs:552), matching the budget already used byMerge_CrossPairs_HighConcurrency_DoesNotDeadlock. Added a brief comment explaining the rationale. The test still fails fast on a real deadlock.Tests
Test-only change. The modified test (
Merge_ConcurrentWithMemoryTypes_ThreadSafe) passes locally on both net8.0 and net10.0; the full suite is 226 passed / 1 skipped on both TFMs.Other changes
No production code changes. No
<PackageReleaseNotes>entry — flaky-test fix is not user-visible. No version bump (accumulates onversion-1.15).