fix(balancer) respect the given balancer size #2747
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
Due to a typo the configured balancer size was not set up, and the default size of 1000 was always used. This fixes some of the (occasionally) failing tests.
thibaultcha
approved these changes
Jul 31, 2017
| @@ -173,7 +173,7 @@ local get_balancer = function(target) | |||
| if not balancer then | |||
| -- no balancer yet (or invalidated) so create a new one | |||
| balancer, err = ring_balancer.new({ | |||
| wheelsize = upstream.slots, | |||
| wheelSize = upstream.slots, | |||
There was a problem hiding this comment.
It seems like this value isn't used by the current version of the balancer lib:
if (not opts.wheelSize) and opts.order then
opts.wheelSize = #opts.order
end
if opts.order then
assert(opts.order and (opts.wheelSize == #opts.order), "mismatch between size of 'order' and 'wheelSize'")
endFrom the above snippet, we can see that if wheelSize isn't given (which is the case prior to this change), then it is inferred from opts.order, which is given. Hence, while this fix is a good catch, it isn't necessary for 0.11.0 or 0.10.4 stable releases (in fact, it is slightly riskier to include it in those).
There was a problem hiding this comment.
Yes, you are right, just double checked it. I ran into it when ripping out the orderlist property. But it seems that that change actually made this bug surface, as it was hidden by the fact that the orderlist was always given.
thibaultcha
added
pr/ready (but hold merge)
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.
Due to a typo the configured balancer size was not set up,
and the default size of 1000 was always used.
This also fixes some of the (occasionally) failing tests.