New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
xds: allow injecting bootstrapOverride in xdsNameResolverProvider #8358
Merged
YifeiZhuang
merged 5 commits into
grpc:master
from
YifeiZhuang:zivy/bootstrap_injection
Aug 11, 2021
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,11 +41,24 @@ | |
@Internal | ||
public final class XdsNameResolverProvider extends NameResolverProvider { | ||
|
||
private static final String SCHEME = "xds"; | ||
private String scheme = "xds"; | ||
private Map<String, ?> bootstrapOverride; | ||
|
||
/** | ||
* A convenient method to create a {@link XdsNameResolverProvider} with custom scheme and | ||
* bootstrap. | ||
*/ | ||
public static XdsNameResolverProvider createForTest(String scheme, | ||
@Nullable Map<String, ?> bootstrapOverride) { | ||
XdsNameResolverProvider provider = new XdsNameResolverProvider(); | ||
provider.scheme = checkNotNull(scheme, "scheme"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a constructor? That'd allow the fields to be final. You'd need to make a no-arg constructor as well. |
||
provider.bootstrapOverride = bootstrapOverride; | ||
return provider; | ||
} | ||
|
||
@Override | ||
public XdsNameResolver newNameResolver(URI targetUri, Args args) { | ||
if (SCHEME.equals(targetUri.getScheme())) { | ||
if (scheme.equals(targetUri.getScheme())) { | ||
String targetPath = checkNotNull(targetUri.getPath(), "targetPath"); | ||
Preconditions.checkArgument( | ||
targetPath.startsWith("/"), | ||
|
@@ -54,14 +67,15 @@ public XdsNameResolver newNameResolver(URI targetUri, Args args) { | |
targetUri); | ||
String name = targetPath.substring(1); | ||
return new XdsNameResolver(name, args.getServiceConfigParser(), | ||
args.getSynchronizationContext(), args.getScheduledExecutorService()); | ||
args.getSynchronizationContext(), args.getScheduledExecutorService(), | ||
bootstrapOverride); | ||
} | ||
return null; | ||
} | ||
|
||
@Override | ||
public String getDefaultScheme() { | ||
return SCHEME; | ||
return scheme; | ||
} | ||
|
||
@Override | ||
|
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This mutates the default factory, which would impact other xds clients. Create a new instance if bootstrapOverride is set.