Merge current v2.11 into v3.1
This commit is contained in:
commit
85f4fd0979
40 changed files with 114 additions and 116 deletions
|
@ -61,13 +61,13 @@ func (b *WRRLoadBalancer) AddWeightedServer(serverHandler Handler, weight *int)
|
|||
}
|
||||
|
||||
func (b *WRRLoadBalancer) maxWeight() int {
|
||||
max := -1
|
||||
maximum := -1
|
||||
for _, s := range b.servers {
|
||||
if s.weight > max {
|
||||
max = s.weight
|
||||
if s.weight > maximum {
|
||||
maximum = s.weight
|
||||
}
|
||||
}
|
||||
return max
|
||||
return maximum
|
||||
}
|
||||
|
||||
func (b *WRRLoadBalancer) weightGcd() int {
|
||||
|
@ -99,8 +99,8 @@ func (b *WRRLoadBalancer) next() (Handler, error) {
|
|||
// what interleaves servers and allows us not to build an iterator every time we readjust weights.
|
||||
|
||||
// Maximum weight across all enabled servers
|
||||
max := b.maxWeight()
|
||||
if max == 0 {
|
||||
maximum := b.maxWeight()
|
||||
if maximum == 0 {
|
||||
return nil, errors.New("all servers have 0 weight")
|
||||
}
|
||||
|
||||
|
@ -112,7 +112,7 @@ func (b *WRRLoadBalancer) next() (Handler, error) {
|
|||
if b.index == 0 {
|
||||
b.currentWeight -= gcd
|
||||
if b.currentWeight <= 0 {
|
||||
b.currentWeight = max
|
||||
b.currentWeight = maximum
|
||||
}
|
||||
}
|
||||
srv := b.servers[b.index]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue