hotfix(upstream) display active targets based on proper definition #2310
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
Tieske
requested changes
Mar 31, 2017
kong/api/routes/upstreams.lua
Outdated
| -- track that we found this host:port so we only show | ||
| -- the most recent one (kinda) | ||
| found[entry.target] = true | ||
|
|
||
| else | ||
| ignored[entry.target] = true | ||
| end |
There was a problem hiding this comment.
style: switch the if and else blocks, short code path first (easier to read)
kong/api/routes/upstreams.lua
Outdated
| for i = 1, found_n do | ||
| found[found[i].target] = nil | ||
| end | ||
|
|
There was a problem hiding this comment.
if you keep track of the ones dealt with in one table (now you track them in found and ignored), then the other table can hold the final result, and hence this final loop won't be necessary anymore
| target = "api-4:80", | ||
| weight = 10, | ||
| upstream_id = upstream3.id, | ||
| }) |
There was a problem hiding this comment.
a case where there are multiple entries, but the last one has weight=0 (and hence is inactive) would be nice here.
Previously we defined active upstream targets as any target with a nonzero weight. This definition was properly implemented, but caused confusion. As such, we redfine 'active targets' to be the most recent entry of each nonzero target. This presents a more accurate picture of the targets currently in use by the balancer.
p0pr0ck5
force-pushed
the
hotfix/proper-active
branch
from
c3c6eba to
ef05185
Compare
|
@Tieske thanks for the comments, fixed up. Also refactored the tests a bit to be easier to read and extend cases. |
Tieske
added
pr/ready (but hold merge)
Tieske
approved these changes
Mar 31, 2017
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.
Previously we defined active upstream targets as any target with
a nonzero weight. This definition was properly implemented, but
caused confusion. As such, we redfine 'active targets' to be the most
recent entry of each nonzero target. This presents a more accurate
picture of the targets currently in use by the balancer.
Fix #2306.