Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: set canary attributes when initializing balancer #3415

Merged
merged 2 commits into from
Nov 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions rootfs/etc/nginx/lua/balancer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,25 @@ local function route_to_alternative_balancer(balancer)
end

-- TODO: support traffic shaping for n > 1 alternative backends
local alternative_balancer = balancers[balancer.alternative_backends[1]]
local backend_name = balancer.alternative_backends[1]
if not backend_name then
ngx.log(ngx.ERR, "empty alternative backend")
return false
end

local alternative_balancer = balancers[backend_name]
if not alternative_balancer then
ngx.log(ngx.ERR, "no alternative balancer for backend: " .. tostring(backend_name))
return false
end

local traffic_shaping_policy = alternative_balancer.traffic_shaping_policy
if not traffic_shaping_policy then
ngx.log(ngx.ERR, "traffic shaping policy is not set for balanacer of backend: " .. tostring(backend_name))
return false
end

local clean_target_header = util.replace_special_char(alternative_balancer.traffic_shaping_policy.header, "-", "_")
local clean_target_header = util.replace_special_char(traffic_shaping_policy.header, "-", "_")

local header = ngx.var["http_" .. clean_target_header]
if header then
Expand All @@ -146,7 +162,7 @@ local function route_to_alternative_balancer(balancer)
end
end

local clean_target_cookie = util.replace_special_char(alternative_balancer.traffic_shaping_policy.cookie, "-", "_")
local clean_target_cookie = util.replace_special_char(traffic_shaping_policy.cookie, "-", "_")

local cookie = ngx.var["cookie_" .. clean_target_cookie]
if cookie then
Expand All @@ -157,7 +173,7 @@ local function route_to_alternative_balancer(balancer)
end
end

if math.random(100) <= alternative_balancer.traffic_shaping_policy.weight then
if math.random(100) <= traffic_shaping_policy.weight then
return true
end

Expand Down
2 changes: 2 additions & 0 deletions rootfs/etc/nginx/lua/balancer/chash.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ function _M.new(self, backend)
local o = {
instance = self.factory:new(nodes),
hash_by = backend["upstream-hash-by"],
traffic_shaping_policy = backend.trafficShapingPolicy,
alternative_backends = backend.alternativeBackends,
}
setmetatable(o, self)
self.__index = self
Expand Down
2 changes: 2 additions & 0 deletions rootfs/etc/nginx/lua/balancer/ewma.lua
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ end
function _M.new(self, backend)
local o = {
peers = backend.endpoints,
traffic_shaping_policy = backend.trafficShapingPolicy,
alternative_backends = backend.alternativeBackends,
}
setmetatable(o, self)
self.__index = self
Expand Down
2 changes: 2 additions & 0 deletions rootfs/etc/nginx/lua/balancer/round_robin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ function _M.new(self, backend)
local nodes = util.get_nodes(backend.endpoints)
local o = {
instance = self.factory:new(nodes),
traffic_shaping_policy = backend.trafficShapingPolicy,
alternative_backends = backend.alternativeBackends,
}
setmetatable(o, self)
self.__index = self
Expand Down
2 changes: 2 additions & 0 deletions rootfs/etc/nginx/lua/balancer/sticky.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ function _M.new(self, backend)
cookie_expires = backend["sessionAffinityConfig"]["cookieSessionAffinity"]["expires"],
cookie_max_age = backend["sessionAffinityConfig"]["cookieSessionAffinity"]["maxage"],
digest_func = digest_func,
traffic_shaping_policy = backend.trafficShapingPolicy,
alternative_backends = backend.alternativeBackends,
}
setmetatable(o, self)
self.__index = self
Expand Down