upstream: log metadata used to create subset lbs #2772
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
Signed-off-by: Stephan Zuercher <stephan@turbinelabs.io>
|
@dnoe do you mind taking a first pass? |
source/common/upstream/subset_lb.cc
Outdated
| return; | ||
| } | ||
|
|
||
| HostPredicate predicate; | ||
|
|
||
| if (fallback_policy_ == envoy::api::v2::Cluster::LbSubsetConfig::ANY_ENDPOINT) { | ||
| bool fallback_any = (fallback_policy_ == envoy::api::v2::Cluster::LbSubsetConfig::ANY_ENDPOINT) || |
| @@ -273,6 +274,26 @@ SubsetLoadBalancer::extractSubsetMetadata(const std::set<std::string>& subset_ke | |||
| return kvs; | |||
| } | |||
|
|
|||
| std::string SubsetLoadBalancer::describeMetadata(const SubsetLoadBalancer::SubsetMetadata& kvs) { | |||
There was a problem hiding this comment.
Can we test this somehow? I think especially with #2751 this won't even get run in most normal cases.
There was a problem hiding this comment.
Added a test case for this.
Signed-off-by: Stephan Zuercher <stephan@turbinelabs.io>
| {"tcp://127.0.0.1:81", {{"version", "default"}}}, | ||
| }); | ||
|
|
||
| upstream_logger->setLevel(spdlog::level::err); |
There was a problem hiding this comment.
If someone configured a different log level for testing on the CLI with --test_arg, won't this overwrite it after the test runs? I wish there was a better way of doing a test like this, but at minimum should we capture the previous log level so we can reset it?
There was a problem hiding this comment.
One option would be to just test the print function directly and not the logging. Up to you.
Signed-off-by: Stephan Zuercher <stephan@turbinelabs.io>
mattklein123
approved these changes
Mar 21, 2018
| @@ -232,21 +244,6 @@ void SubsetLoadBalancer::update(uint32_t priority, const HostVector& hosts_added | |||
| }); | |||
| } | |||
|
|
|||
| bool SubsetLoadBalancer::hostMatchesDefaultSubset(const Host& host) { | |||
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.
Per a slack conversation, it would be useful is the subset load balancer logged the metadata it used to create it's underlying loadbalancers. This modifies the subset load balancer to track the default subset using the same data type used for non-default subsets (thereby eliminating the
hostMatchesDefaultSubsetfunction). Logging occurs at the debug level.Signed-off-by: Stephan Zuercher stephan@turbinelabs.io
Risk Level: Low
Testing: existing unit tests cover the aded code and prove that no functional changes occurred.