xdsclient: relay marshalled bytes of complete resource proto to decoders #8422
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
purnesh42H
added
Type: Bug
Area: xDS
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #8422 +/- ##
==========================================
+ Coverage 82.27% 82.34% +0.07%
==========================================
Files 414 414
Lines 40424 40421 -3
==========================================
+ Hits 33259 33286 +27
+ Misses 5795 5773 -22
+ Partials 1370 1362 -8
🚀 New features to boost your workflow:
|
dfawley
reviewed
Jun 30, 2025
| func (gd *GenericResourceTypeDecoder) Decode(resourceBytes []byte, gOpts xdsclient.DecodeOptions) (*xdsclient.DecodeResult, error) { | ||
| raw := &anypb.Any{TypeUrl: gd.ResourceType.TypeURL(), Value: resourceBytes} | ||
| rProto := &anypb.Any{} | ||
| if err := proto.Unmarshal(resourceBytes, rProto); err != nil { |
There was a problem hiding this comment.
It seems like such a waste to decode, encode, and re-decode this.
An Any is just a TypeURL and a []byte with the serialized proto data in it. Can we pass those two fields directly instead of the resourceBytes []byte that is a serialized proto message containing those two fields? This could then fill those in. Maybe just make a struct called AnyProto so it can extensibly mirror anypb.Any without putting a foreign symbol into our API?
There was a problem hiding this comment.
Thanks. That's a good idea. It requires to change the Decode interface but its fine since no one is using the new client. Changed.
…erialized proto bytes
arjan-bal
approved these changes
Jul 1, 2025
| return "", listenerUpdate{}, fmt.Errorf("failed to unwrap resource: %v", err) | ||
| } | ||
| if !xdsresource.IsListenerResource(rProto.GetTypeUrl()) { | ||
| return "", listenerUpdate{}, fmt.Errorf("unexpected listener resource type: %q ", rProto.GetTypeUrl()) |
There was a problem hiding this comment.
nit: Extra space at end of the error string.
Pranjali-2501
pushed a commit
that referenced
this pull request
Jul 16, 2025
Pranjali-2501
pushed a commit
to Pranjali-2501/grpc-go
that referenced
this pull request
Jul 17, 2025
arjan-bal
added a commit
that referenced
this pull request
Jul 17, 2025
* xdsclient: preserve original bytes for decoding when the resource is wrapped (#8411) * xds: Avoid error logs when setting fallback bootstrap config (#8419) * xdsclient: relay marshalled bytes of complete resource proto to decoders (#8422) * xds: give up pool lock before closing xdsclient channel (#8445) * transport: release mutex before returning on expired deadlines in server streams (#8451) --------- Co-authored-by: Easwar Swaminathan <easwars@google.com> Co-authored-by: Arjan Singh Bal <46515553+arjan-bal@users.noreply.github.com> Co-authored-by: Purnesh Dixit <purneshdixit@google.com> Co-authored-by: Doug Fawley <dfawley@google.com>
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
3 participants
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.
In internal usages of xdsclient, it was found that some resource type implementations (like MintCollection) expect wrapped resource to retrieve some information like
ResourceName. Currently, xdsclient is sending the underlying raw resource to decoders which can breakMintCollectionresource type implementation (internal discussion).This PR make the change to relay complete resource (including wrapped) to decoders and let them decode as they want.
RELEASE NOTES: None