[release-22.0] Deflake TestVStreamsMetricsErrors. (#18679)#18684
[release-22.0] Deflake TestVStreamsMetricsErrors. (#18679)#18684vitess-bot[bot] wants to merge 1 commit intorelease-22.0from
TestVStreamsMetricsErrors. (#18679)#18684Conversation
|
Hello @arthurschreiber, there are conflicts in this backport. Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually. Make sure you replace |
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
a1735c8 to
f72a02d
Compare
f72a02d to
ae66cb3
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release-22.0 #18684 +/- ##
================================================
+ Coverage 67.53% 67.54% +0.01%
================================================
Files 1600 1600
Lines 262018 262018
================================================
+ Hits 176950 176984 +34
+ Misses 85068 85034 -34 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:
If no action is taken within 7 days, this PR will be closed. |
|
This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:
If no action is taken within 7 days, this PR will be closed. |
|
This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:
If no action is taken within 7 days, this PR will be closed. |
|
This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:
If no action is taken within 7 days, this PR will be closed. |
ae66cb3 to
58c0ff4
Compare
There was a problem hiding this comment.
Pull request overview
Backports the fix from #18679 to deflake TestVStreamsMetricsErrors by removing the test’s dependency on a deterministic ordering between multi-shard VStream event delivery and shard error propagation.
Changes:
- Refactors
TestVStreamsMetricsErrorsto avoid deadlock by collecting VStream callback results through a channel and waiting for completion deterministically. - Updates assertions to tolerate the valid race where the non-error shard may or may not emit events before the overall stream is canceled.
- Adjusts vstreams-ended-with-errors metric validation to account for either ordering outcome while still enforcing the error shard’s expected behavior.
|
Upstream has sufficiently diverged that I don't think this is worth it anymore. Closing. |
Description
This is a backport of #18679