xds: set dial target in request resource_names #3081
Merged
Conversation
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
easwars
requested changes
Oct 8, 2019
|
PR description updated. |
easwars
reviewed
Oct 10, 2019
Comment on lines
-155
to
-163
| node: &basepb.Node{ | ||
| Metadata: &structpb.Struct{ | ||
| Fields: map[string]*structpb.Value{ | ||
| internal.GrpcHostname: { | ||
| Kind: &structpb.Value_StringValue{StringValue: serviceName}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, |
There was a problem hiding this comment.
Will LRS be eventually moved to the xdsClient and will a nodeProto (read from the bootstrap file) be added to the request there? If not, is OK to not have a nodeProto at all in the LRS request?
There was a problem hiding this comment.
Yes, LRS will be moved to the same xdsClient.
There was a problem hiding this comment.
Should we add a TODO to say that we should add the NodeProto here once we move it to the xdsClient.
easwars
approved these changes
Oct 10, 2019
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.
And stop sending metadata
TRAFFICDIRECTOR_GRPC_HOSTNAME.Similarly, for LRS, cluster_name is set to the dial target.
The expected resource_names can be in a different format from dial target. (test_service.test_namespace.traffic_director.com vs test_namespace:test_service). The mapping will be done by LDS/RDS/VHDS + CDS.
The workaround was to leave resource_names empty, and send dial target as metadata
TRAFFICDIRECTOR_GRPC_HOSTNAME.This change sets dial target directly in resource_names, and removes metadata. The server don't need to read the metadata for service name, but needs to support two formats of resrouce_names (test_service.test_namespace.traffic_director.com and test_namespace:test_service).
When all the missing pieces are done, resource_names will be set as the cluster names from CDS response.
For LRS, cluster_name will be set to the same name.