xdsclient: Fix flakyness in TestResourceUpdateMetrics in the case of repeated NACKs#8363
Merged
purnesh42H merged 2 commits intogrpc:masterfrom May 28, 2025
Merged
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #8363 +/- ##
==========================================
+ Coverage 82.27% 82.34% +0.06%
==========================================
Files 419 419
Lines 42039 42039
==========================================
+ Hits 34587 34616 +29
+ Misses 5994 5968 -26
+ Partials 1458 1455 -3 🚀 New features to boost your workflow:
|
dfawley
approved these changes
May 27, 2025
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes: #8344
Successful forge test
In a rare case scenario of NACK, the xDS client can emit metrics in quick succession due to the interaction sequence between the xDS client (in grpc-go) and the test management server (using go-control-plane) after the initial invalid update. The test uses
testMetricsReporterfor xdsclient to report metrics which callsmetricsReporter.ReportMetric()to report invalid and valid xds resource updates. The flakiness is due to timeout inr.metricsCh.Send(m)in the case burst of redundant updates because themetricsChintestMetricsReporteris atestutils.Channelinitialized with a size of 1. A Send operation on this channel will block if the channel is full. See #8344 (comment)We can mitigate the race by making the metric sends non-block by dropping redundant update and replacing with the new one. Similar to what is being done in internal grpc metrics recorder https://github.com/grpc/grpc-go/blob/master/internal/testutils/stats/test_metrics_recorder.go#L125-L126
RELEASE NOTES: None