xds: Avoid error logs when setting fallback bootstrap config#8419
Merged
arjan-bal merged 2 commits intogrpc:masterfrom Jul 1, 2025
Merged
xds: Avoid error logs when setting fallback bootstrap config#8419arjan-bal merged 2 commits intogrpc:masterfrom
arjan-bal merged 2 commits intogrpc:masterfrom
Conversation
Contributor
Author
|
FYI @apolcyn |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #8419 +/- ##
==========================================
+ Coverage 82.26% 82.40% +0.14%
==========================================
Files 414 414
Lines 40424 40426 +2
==========================================
+ Hits 33255 33314 +59
+ Misses 5802 5757 -45
+ Partials 1367 1355 -12
🚀 New features to boost your workflow:
|
dfawley
approved these changes
Jun 30, 2025
| testGetConfigurationWithFileContentEnv(t, name, true, nil) | ||
| }) | ||
| } | ||
| name := "empty" |
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
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.
2 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.
Initially, there was no error log when setting the fallback bootstrap config. The GetConfiguration function would first attempt to read the bootstrap configuration from environment variables and then fall back to the configuration provided by the c2p resolver.
A subsequent change, which added an xDS client pool, modified this behavior. It read the bootstrap config within an init() function in clientimpl.go, preventing the c2p resolver from setting its fallback configuration after channel creation. A fix was implemented (#8050) to allow setting a fallback bootstrap config on an xDS client pool, but this introduced an error log when setting the fallback config twice. This happens when multiple c2p resolvers are created in the same process.
After that, #8164 reverted the behavior of reading the bootstrap in the init() function. This allows us to return to the original way—reading from environment variables and then falling back to the c2p resolver's config—without requiring an error log.
RELEASE NOTES:
Attempt to set a bootstrap configuration...when creating multiple directpath channels.