DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed review findings.

Browse source
This commit is contained in:
Alexander Maret-Huskinson 2019-09-24 10:46:02 +02:00
parent 880b3dc5f1
commit f1839ddb42
4 changed files with 13 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rootfs/etc/nginx/lua/balancer/sticky_balanced.lua
View file

@ -5,9 +5,9 @@
-- pods.
--
local balancer_sticky = require("balancer.sticky")
local math = require("math")
local math_random = require("math").random
local resty_chash = require("resty.chash")
local util = require("util")
local util_get_nodes = require("util").get_nodes
local _M = balancer_sticky:new()
@ -18,7 +18,7 @@ local _M = balancer_sticky:new()
local MAX_UPSTREAM_CHECKS_COUNT = 20
function _M.new(self, backend)
local nodes = util.get_nodes(backend.endpoints)
local nodes = util_get_nodes(backend.endpoints)
local o = {
name = "sticky_balanced",
@ -33,17 +33,9 @@ function _M.new(self, backend)
return o
end
function _M.get_routing_key(self)
return self:get_cookie(), nil
end
function _M.set_routing_key(self, key)
self:set_cookie(key)
end
function _M.pick_new_upstream(self, failed_upstreams)
for i = 1, MAX_UPSTREAM_CHECKS_COUNT do
local key = string.format("%s.%s.%s", ngx.now() + i, ngx.worker.pid(), math.random(999999))
local key = string.format("%s.%s.%s", ngx.now() + i, ngx.worker.pid(), math_random(999999))
local new_upstream = self.instance:find(key)
if not failed_upstreams[new_upstream] then