xds/cdsbalancer: correctly remove the unwanted cds watchers #8428
+58
−7
Conversation
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #8428 +/- ##
==========================================
+ Coverage 82.38% 82.45% +0.06%
==========================================
Files 414 414
Lines 40403 40402 -1
==========================================
+ Hits 33287 33313 +26
+ Misses 5756 5733 -23
+ Partials 1360 1356 -4
🚀 New features to boost your workflow:
|
arjan-bal
reviewed
Jul 4, 2025
Comment on lines
446
to
449
| var onwatcherUpdated = func() { | ||
| // This function is a no-op, but can be overridden in tests to signal that | ||
| // the watchers map has been updated. | ||
| } |
There was a problem hiding this comment.
I think you can avoid adding a function specifically for tests and instead verify that the unsubscription happens by intercepting the requests in the xDS management server. When creating the xDS management server, you can provide an OnStreamRequest in e2e.ManagementServerOptions. Once the management server removes the cluster, you can wait for an update CDS discovery request from the xds client which should not have the removed cluster.
There was a problem hiding this comment.
Done. Changed the test.
arjan-bal
approved these changes
Jul 7, 2025
|
Please add release notes. |
dfawley
approved these changes
Jul 7, 2025
dimpavloff
pushed a commit
to dimpavloff/grpc-go
that referenced
this pull request
Aug 22, 2025
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.
RELEASE NOTES:
In the code for
onClusterUpdateafter the cluster tree has been updated, we want to remove the watchers for clusters that are not currently in the tree. The existing code will always panic because of the error in condition. This change fixes the removal of unwanted watchers.