upstream: switch zone-aware routing to single level locality-aware. #1797
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
We now do single level locality-aware routing, using the EDS supplied Locality consisting of (region, zone, sub_zone). This is only a simple extension and rename of zone aware routing, there is no support yet for multi-level locality routing (see envoyproxy#1796). Signed-off-by: Harvey Tuch <[email protected]>
rshriram
reviewed
Oct 3, 2017
include/envoy/upstream/upstream.h
Outdated
| * @return hosts per zone, index 0 is dedicated to local zone hosts. | ||
| * If there are no hosts in local zone for upstream cluster hostPerZone() will @return | ||
| * @return hosts per locality, index 0 is dedicated to local locality hosts. | ||
| * If there are no hosts in local locality for upstream cluster hosstPerLocality() will @return |
rshriram
reviewed
Oct 3, 2017
| @@ -13,7 +13,7 @@ | |||
| namespace Envoy { | |||
| namespace Upstream { | |||
|
|
|||
| static const std::string RuntimeZoneEnabled = "upstream.zone_routing.enabled"; | |||
| static const std::string RuntimezoneEnabled = "upstream.zone_routing.enabled"; | |||
rshriram
reviewed
Oct 3, 2017
| return; | ||
| } | ||
|
|
||
| size_t num_zones = host_set_.healthyHostsPerZone().size(); | ||
| ASSERT(num_zones > 0); | ||
| size_t num_localitys = host_set_.healthyHostsPerLocality().size(); |
rshriram
reviewed
Oct 3, 2017
| // At this point it's guaranteed to be at least 2 zones. | ||
| size_t number_of_zones = host_set_.healthyHostsPerZone().size(); | ||
| // At this point it's guaranteed to be at least 2 localitys. | ||
| size_t number_of_localitys = host_set_.healthyHostsPerLocality().size(); |
rshriram
reviewed
Oct 3, 2017
|
|
||
| // This potentially can be optimized to be O(log(N)) where N is the number of zones. | ||
| // This potentially can be optimized to be O(log(N)) where N is the number of localitys. |
There was a problem hiding this comment.
let me guess: emacs query-replace ? /zone/locality/ ? ;)
There was a problem hiding this comment.
Yes, tree-wide search/replacing, will fix tomorrow, thanks for picking up these.
rshriram
reviewed
Oct 3, 2017
Signed-off-by: Harvey Tuch <[email protected]>
mattklein123
reviewed
Oct 3, 2017
| if (!local_info_.zoneName().empty()) { | ||
| std::map<std::string, std::vector<HostSharedPtr>> hosts_per_zone; | ||
| // If local locality is not defined then skip populating per locality hosts. | ||
| const Locality local_locality(local_info_.node().locality()); |
There was a problem hiding this comment.
nit: why copy here? Reference? Or does locality() return a copy?
There was a problem hiding this comment.
OK I see this is a helper that unpacks the locality.
There was a problem hiding this comment.
We could do it more efficiently, with std::string& in the std::tuple, but I think this might be an issue with our multiple string implementation today.
| @@ -35,6 +35,20 @@ | |||
| namespace Envoy { | |||
| namespace Upstream { | |||
|
|
|||
| // Wrapper around envoy::api::v2::Locality to make it easier to compare and construct literals (for | |||
There was a problem hiding this comment.
nit: this is used in not test code right? (Per my other comment). Change comment?
There was a problem hiding this comment.
This is used in both eds.cc and eds_test.cc. I'll update the comment.
Signed-off-by: Harvey Tuch <[email protected]>
Signed-off-by: Harvey Tuch <[email protected]>
Signed-off-by: Harvey Tuch <[email protected]>
mattklein123
approved these changes
Oct 3, 2017
rshriram
pushed a commit
to rshriram/envoy
that referenced
this pull request
Oct 30, 2018
* wire through route directive Signed-off-by: Kuat Yessenov <[email protected]> * fix format Signed-off-by: Kuat Yessenov <[email protected]> * propagate info Signed-off-by: Kuat Yessenov <[email protected]> * review Signed-off-by: Kuat Yessenov <[email protected]> * implement the API Signed-off-by: Kuat Yessenov <[email protected]> * manual test Signed-off-by: Kuat Yessenov <[email protected]> * review Signed-off-by: Kuat Yessenov <[email protected]> * fix upstream api change Signed-off-by: Kuat Yessenov <[email protected]> * add a test case Signed-off-by: Kuat Yessenov <[email protected]> * review, handle direct response headers Signed-off-by: Kuat Yessenov <[email protected]>
jpsim
pushed a commit
that referenced
this pull request
Nov 28, 2022
Description: Removes network-specific clusters and replaces with a filter that sets unique socket options based on current preferred network (via Reachability) status. Envoy internally creates a different socket pool for a unique set of socket options, so the effect of this is that we still use different sets of connections per interface, but no longer rely on a large set of clusters to do so. This PR also lays the groundwork for us to experiment with interface-bound sockets. Risk Level: High Testing: Existing unit and integration coverage Signed-off-by: Mike Schore <[email protected]> Signed-off-by: JP Simard <[email protected]>
jpsim
pushed a commit
that referenced
this pull request
Nov 29, 2022
Description: Removes network-specific clusters and replaces with a filter that sets unique socket options based on current preferred network (via Reachability) status. Envoy internally creates a different socket pool for a unique set of socket options, so the effect of this is that we still use different sets of connections per interface, but no longer rely on a large set of clusters to do so. This PR also lays the groundwork for us to experiment with interface-bound sockets. Risk Level: High Testing: Existing unit and integration coverage Signed-off-by: Mike Schore <[email protected]> Signed-off-by: JP Simard <[email protected]>
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.
We now do single level locality-aware routing, using the EDS supplied Locality consisting of
(region, zone, sub_zone). This is only a simple extension and rename of zone aware routing, there is
no support yet for multi-level locality routing (see #1796).
Signed-off-by: Harvey Tuch [email protected]